Merge branch '786-minervanet-error-report-60' into 'master'

Resolve "MINERVANET - Error Report 60"

Closes #854 and #786

See merge request !865
32 jobs for master in 11 minutes and 49 seconds (queued for 2 seconds)