Merge pull request #1832 from jkczyz/2022-11-composite-handler