Merged changes from gocart/GoCart