#19878 and #19886 on new branch