CR fix
Merge pull request #1027 from marcosgdf/develop

CR fix