Merge "[ESR] Add logs to STDOUT"