DDBEASY 193 - Separate module with exports and overrides.
Merge branch 'DDBEASY-193' into development