Merge branch 'feature/2588' into merge/develop_feature/2588_JAL-2588