Merge branch 'JAL-895/reopen' into Release_2_8_1_Branch