Merge branch 'for-6.5/block-late' into block-6.5