Code

Merge branch 'zj/test-cred-helper-nicer-prove'