Merge pull request #1592 from tnull/2022-07-manual-penalty