Merge branch 'STORM-1285'