GF-53448 Added check for control
Merge pull request #892 from enyojs/GF-53448-Anish-ramesan

GF-53448 Added check for control