Merge branch 'JAL-1517_release282' into develop