Merge branch 'jh/p4-rcs-expansion-in-bytestring'