Merge branch 'hotfix/test'
Upcoming invoice fix
Merge branch 'hotfix/upcoming_invoice' into develop