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