Merge "Fix bug with enterprise contacts test" into main