Merge pull request #7686 from mbauskar/fixes

[minor] auto close issue using ORM (document save method)