CRAFTERCMS-133 (Managed to fix this issue removing delete profile services and adding active profile service) and CRAFTERCMS-177(code review)
Merge remote-tracking branch 'alvaro/master'