CR Fix
Merge pull request #1646 from marcosgdf/develop

CR Fix