Merge "Fix buffer mapping of BLOB buffers" into main