show logo by default put on
Merge remote-tracking branch 'upstream/develop' into develop