Merge pull request #5976 from jow-/ucode