MIFOSX-1021 View Saving charge
Merge pull request #868 from lingalamadhukar/bug_fixes

MIFOSX-1021 View Saving charge