Merge branch 'STORM-841-0.9.x' into 0.9.x-branch