Merge branch 'STORM-2903-1.0.x-merge' into 1.0.x-branch