Partly added changes from r9231, r9232, r9235 & r9236 from /tags/modified-shop-1.06 to /branches/modified-shop-1.06-SP3