Gail Badner, would it help if I just create a PR for 5.3 with all the necessary backports for you and let you review that? It wouldn't take very long for me to put that together if that would be much easier for you.