Merge remote branch 'origin/pr/1240/head' into merge_1240