Merge "fix hex parsing of bmgr"