Make use of new sites code in core

Change-Id: Ie639247b59abce24c9c43420de8a642e63f0978b
Merge "Make use of new sites code in core"