Merge remote-tracking branch 'kevin/tags/for-upstream' into block