Address issue 16800 (#16810)