Merge pull request #1797 from arik-so/2022-10-channel-manager-deparameterization