Revert "Revert "Merge pull request #42 from gpsantos/GRAILS-11670""

This reverts commit a7229a35aee45a1cfd96232f904b11082c8baf60.