Shopping cart fix as per 4.0.0-cleanup branch