Merge branch 'update_docs_and_fix_bugs_for_security_verif' into 'master'

Update docs and models and fix bugs for security verification

See merge request !452