DDBEASY 116 - Patch updates.
Merge branch 'DDBEASY-116b' into development