c66b57a3b4
* Use isOnline
* when -> if/else
(cherry picked from commit 156feb6e8e)
* Use isOnline
* when -> if/else
(cherry picked from commit 156feb6e8e)