Merge "Verify staged session remain unchanged on system server reboot" into rvc-dev