Merge pull request #20011 from seamuslee001/migrate_library