Revert "Revert "Merge pull request #4803 from lucascaton/master""

This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.