Merge branch 'pk/rebase-in-c'