PROM-1478, PROM-1479, PROM-1480, PROM-1481, PROM-1484: adding new sites and consolidating config.