I'm ok with closing this task if it's covered by test cases.

Jan Hellar Btw the test case you've linked doesn't cover test scenario "offline -> online". Should it be fixed or is it covered by a different test case?