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