Merge "To fix coverity issue - color controller" into devel/master