Merge branch 'master' into feature-new-bytestring-builder