Merge pull request #954 from TheBlueMatt/2021-06-no-spurious-forward-fails