Handle multiple canvases per page
Merge remote-tracking branch 'origin/scribing-qns' into scribing-qns