Merge branch 'features/r2_11_2/JAL-3821_reinstate_patch' into develop