The csLog source.
Merge branch 'Kris_Main' into develop