Required for #267 . Doing this for all codebases and not just 1.20's to make future additions/refinements easier, and just because it makes sense.