bug fixes from fork

Merged Benjamin Pelaudeix requested to merge fix into develop

Merge request reports