Merge branch 'enable_bytes' into sonots