MIFOSX-1027 Fixing issues with maker checker
Merge pull request #833 from lingalamadhukar/MIFOSX-1027

MIFOSX-1027 Fixing issues with maker checker