BC-1696 #resolve Better cart on session..
Merge remote-tracking branch 'origin/2.1.x'