Merge "RS: Rename mBuf to mSlot"