SetEnabled replaced Enable and Disable
Code Review applied on commit '61162bac6b720f289f1897660b2ded134ec0ae51'.
Code review applied on commit '9a70f3ad011dfb529818b33ca3bc1e406b4d8cbf'.
Merge branch 'Vanatis-develop' into develop