Cart fixes for delete and empty.
Merge branch 'release-2.3'