Merge pull request #158 from telefonicaid/bug/152

Bug/152
Merge branch 'develop' into hardening/68