The issue seems already fixed by PR #16982 and its follow-up commit 4934ba2121.
4934ba2121
And use wait_online()