a few cherry picks for 1.3