WIP: new-cbs #117

Closed
kazhnuz wants to merge 23 commits from new-cbs into master
No description provided.