Merge branch 'STORM-1876' of github.com:abhishekagarwal87/storm