Design for KEYCLOAK-238
Merge remote-tracking branch 'upstream/master'
Merge pull request #140 from cardosogabriel/master

Design for KEYCLOAK-238