Merge branch 'JAL-1164_regression' into develop