Merge branch 'JAL-957_jbake' into r281_JAL-957