remove credit cashing
Merge remote-tracking branch 'origin/external-interface' into external-interface

* origin/external-interface:
  bug fix