Yes, I did cherry pick that single change. This additional commit resolved the issue I was seeing.
Thanks, Jon