DDBEASY-28 - Correction for OS 3.0.
Merge branch 'DDBEASY-28' into develop