Update convert, thread from develop.