Always use the cbs actions and never the setting actions
Merge pull request #1256 from jeapostrophe/master

Always use the cbs actions and never the setting actions