Fix Contact

Merged Benoit Martins requested to merge fix/contact into release/6.0

Merge request reports