Merge branch 'YSTORM-5412' of https://github.com/dandsager1/storm into STORM-3392-merge