Fix online/offline -- Related to 1994
Merge branch 'michel_1944_typo' into next