Merge branch 'JAL-895/reopen' into develop