Merge branch 'JAL-1422_srs' into JAL-1422_srs_r281