DDBEASY 116 - Separate patches with different purpose.
DDBEASY 116 - Alma patch removed.
Merge branch 'DDBEASY-116b' into development