Maint/master/more cherry picks for 11x