added check for no online user
added check for no online user
Merge branch 'release/v0.9.4-1' into develop