Merge branch 'storm-537-infinite-reconnection' of https://github.com/Sergeant007/storm into STORM-537