Merge branch 'cb/limits'