Merge "Fix multisite links"