Merge branch 'limits'