so the

1.3.x

branch contains some old master sha, and then a series of cherry-picked prs from master (and hopefully nothing else)