Merge branch 'topic/cvt-dev-prints' into for-next