DDBEASY 106 - Warning elimination.
DDBEASY 106 - Code corrections.
Merge branch 'DDBEASY-106' into develop