DDBEASY 223 - Functionality improovements.
Merge branch 'DDBEASY-223' into develop