That’s a backport for the gnome-3-34 branch of the fixes of bugs found when working on the !12 (merged) MR.