Merge pull request #1631 from Sahil-Gupta584/fix/staled-kody-rules