Merge branch '894-minervanet-error-report-98' into 'master'

Resolve "MINERVANET - Error Report 98"

Closes #894

See merge request !890
33 jobs for 892-minervanet-error-report-96 in 19 minutes and 30 seconds (queued for 2 seconds)