simplified way of stripping the stack from DefaultStackError when we want to hide it
merge
Merge branch 'master' into feature/billing_group