updated trait usage
Merge branch 'dev-form' into dev-amount-type