Bug Fixes for 1.23 release
Merge pull request #928 from lingalamadhukar/MIFOSX-1267

Bug Fixes for 1.23 release