Mergability with development branch
Also check ip_as_username config when applying per-server limit