Merge "[CDS] Add logs to STDOUT"