Revert "Trimmed the branch to only the world_canvas_utils sub directory"

This reverts commit b71605c9f5944999fde79904443877cb419f10e2.
Rebase from 'upstream'
Trimmed the branch to only the world_canvas_utils sub directory