invoice-cron-add-trim()
Merge origin/staging into staging
invoice-cron-add-trim()