OOIION-1855: Fix to a site's primary device