Merge branch 'bp-remove-pc-buf' into for-next