Merge branch 'STORM-1200' of https://github.com/haohui/storm into STORM-1200-V1