[EditSuite] Resolved #331
Merge pull request #352 from frmwrk123/ticket_331

[EditSuite] Resolved #331