Fixing REGISTRY-2262
Merge branch 'ajithnv-master'