Qa

Merging to master, mainly so the canvas team can decide if they need the cache update.