Update for latest cs-core.
Merge remote-tracking branch 'origin/master'