Merge pull request #826 from martinthomson/retain-mod-convert #3129

Job	Run time
Basic Checks	18m 39s
Release builds and tests	9m 19s
sanitize (address)	11m 27s
Additional Builds and Concurrency Tests	17m 9s
sanitize (leak)	6m 51s
	1h 3m 25s

Provide feedback