Decomposition (#5260) - Basecamp