merged additional vulnerabilidad changes from laura