Merge branch 'rework/buffers-cleanup' into for-linus