[yt-dev] Backporting bugfixes for yt 3.3.2