issue #19133, issue #18957: Merge to master.