Merge branch 'STORM-3407'