Dev to master

Should be merged into master; its about time.
yeah, but the check and the conversion is done separately in where it's used as the check is needed by itself...