Merge "Fix for bmgr whitelist"