Merge "Remove reference to $aicSiteId variable"