Patch release fixing a minor bug introduces in 1.17.1 as well as some other minor tweaks to follow core design patterns.