Merge branch 'YSTORM-6355' of github.com:dandsager1/storm into YSTORM-6355