I transplanted the code into master, since there was no major changes that the patch touched, it's just glided on into the master branch with no issues. It's running and tested in production in 2.3 and 2.2.16 versions.