DDBEASY 166 - Removes useless popup.
DDBEASY 166 - Fixes warnings.
Merge branch 'DDBEASY-166' into develop