Update regex, convert from develop.