Created originally on Bitbucket by carolman (Carol Man)
Changesets for this Pull Request have not been imported, because it had been already declined on Bitbucket. Marked as closed by the import user.
this is for better review for issue 1713 and issue 1673