Clean up customer model
Merge remote-tracking branch 'origin/development' into c-refactor-customer-model
Merge branch 'c-refactor-customer-model' into c-refactor-explore