Merge branch 'version_fixups' into lmc_integration