term capitalized on user edit
Merge branch 'cash-dev-branch'