LUN-600 -- save and restore site_id