Merge branch 'JAL-1130' into develop