Merge branch 'STORM-2660-1.0.x' into 1.0.x-branch