experimental fix for MARMOTTA-506 (unit tests are running but needs more testing)
Merge remote-tracking branch 'origin/develop' into develop