WIP Term Customer Changes

Closed Sid Sijbrandij requested to merge term-customer-changes into master

Waiting for feedback from customer.

Merge request reports