Merge "Update UTF8 text array for 5 and 6 bytes" into devel/master