Merge branch 'jc/rebase-in-c-5-test-typofix'