Two FIXME P9 attacked, one fixed the other commented
Merge branch 'develop' into hardening/fixme9
changed fixme text
CHANGES_NEXT_RELEASE
Merge pull request #207 from telefonicaid/hardening/fixme9

Hardening/fixme9