WIP: credit-send-hotfix #109

Draft
Alfred-mk wants to merge 5 commits from credit-send-hotfix into master

5 Commits