Merge pull request #1359 from marcel-blonk/release-46

make sure all beans have ids
Merge pull request #1361 from john-hill/PLFM-2843

check
give more beans ids
Merge pull request #1364 from marcel-blonk/release-46

give more beans ids
merged from develop
missing
equals
check