RELOAD Fix the issue that UI starts before the reload server is up.
Merge remote-tracking branch 'kostas/OneZero' into OneZero