Merge branch 'jk/submodule-c-credential'