r27069 - refactor: various suggested fixes + refactoring by @midgleyc

[Github Bot]

What's Changed​

• refactor: various suggested fixes + refactoring by @midgleyc in #1413

Full Changelog: r27068...r27069

View on Github