Bug Fixes for 1.23 release
Merge pull request #946 from lingalamadhukar/m_issues

Bug Fixes for 1.23 release