Merge branch 'pk/rebase-in-c-6-final'