Merge "Added Tooltip functionality to Control" into devel/master