Merge "Rename ByteBufferAs*.offset to byteOffset" into main