Merge feature/generic-user-popup into master : Revert pom's version.