Merge pull request #1307 from jkczyz/2022-02-block-source-self-ref