Merge branch 'test_paolo_JAL-1065' into Release_2_7_Branch