Add version check on startup
Fix version checking bug
Merge remote-tracking branch: upstream/master