Fix memberOf detection. Fixes: #9835
Fix remarks in #9848
Fix initializing in #9848
Merge pull request #9848 from dupondje/master

Fix memberOf detection. Fixes: #9835