Merge branch 'STORM-2841-1.x-merge' into 1.x-branch