Merge branch 'develop' into JAL-1705_trialMerge