test fix
Merge pull request #1650 from marcel-blonk/PLFM-3074

test fix
Merge remote-tracking branch 'upstream/develop' into PLFM-2858