JAL-3210 Merge branch 'develop' into trialMerge