I've almost landed #7115, is there just one commit that I could cherry pick into those changes as well?