Merge "Fixing an issue with convert... utility methods."