#483 [Anuj/ Rishi] Merging canvas with instructure/stable