Merge branch 'patch/version_manager_removal'