#MIFOSX-919,#MIFOSX-973,#MIFOSX-979
Merge pull request #836 from lingalamadhukar/MIFOSX-979

#MIFOSX-919,#MIFOSX-973,#MIFOSX-979