Merge branch 'STORM-1594'