initial #19888 patch