Merge branch 'develop' into development/Release_2_12_Branch_JAL-4102_21126_merge