Merge branch 'sb/retire-convert-objects-from-contrib'