Merge remote-tracking branch 'upstream/develop' into PLFM-2842
make sure all beans have ids
Merge pull request #1357 from marcel-blonk/PLFM-2842

make sure all beans have ids