Internet and volatile updates
(cherry picked from commit 46cc0cac5a3e47af0523160b10b7534149fdb74f)