Merge pull request #2744 from akoeplinger/convert-fixes