Updated to support SITE-679 and SITE-680