Merge "Write criproxy log to corresponding folder" into release/2019.2.0