Canonical Decomposition (#7432) - Basecamp