ShoppingCart follow-up done

ShoppingCart follow-ups are implemented according to the 15 min release
back scheme