We went through master commits with ofourdan and came up with a list of these to backport for now; there's a few more that might be nice but are much harder to backport.
