Merged Create Canvas Pull Request - Manual Merge