Merge branch 'JAL-1422_srs_r281' into develop