Merge branch 'STORM-352'