Merge "Fix convert8To4, convert8To5"