[yt-dev] 3.1: PRs to merge