backport my checkin from master