This will be a delicate PR, as it will change the site ID numbers above it and thus might break some dashboard.