Merge branch 'patchwork' into topic/docs-next