Merge branch 'for-6.1/block' into block-6.1