Merge branch 'bugfix/JAL-841_JAL-1081' into develop