Merge "Fixed bmgr so it supports --user cur" into main