CRAFTERCMS-124: Profile Unit Testing
Merge remote-tracking branch 'alvaro/master'