Add credit spec. Blocked on 500s.
Merge remote-tracking branch 'upstream/pm' into pm