Merge branch 'JAL-957_jbake' into Release_2_8_Branch