Merge branch 'version_fixups' into lmc_integration_multi
Merge branch 'multiple_named_configurations' into lmc_integration_multi