move PR3462 to here.