MOB-1970

Cherry picked nAndy's fixes.