make sure concrete type is set
Merge pull request #1553 from marcel-blonk/PLFM-3011

make sure concrete type is set
Merge remote-tracking branch 'upstream/develop' into PLFM-2987