Merge branch '1540-export-error' into 'devel_16.0.x'

Resolve "MINERVANET - Error Report 326"

See merge request !1335
41 jobs for devel_16.0.x in 15 minutes and 37 seconds (queued for 7 seconds)