CSH-1287 : #time 30m #comment Duplicate feature/storm-refactor code into this new branch