Merge branch 'Release_2_8_2_Branch' into JAL-1483_featureBasedTreeCalc