Merge in master, fix change to worksheet api router