IM-1572: Fixes the issue for non upgraded sites
Merge pull request #702 from m038/4.2

IM-1572: Fixes the issue for non upgraded sites