Merge branch 'STORM-3352' of https://github.com/srdo/storm into STORM-3352-merge