synching merge fixes.