Merge remote-tracking branch 'origin/issue-388-fix-missing-logs-at-startup' into develop_integration_2019_w03