issue #18848: Merge to master.