move PR9661 out to here.