Update convert, regex from develop.