Merge pull request #22354 from lvoegl/pr/20230910-swanmon