Merge branch 'convert-src-to-7bit'