Follow up to Issue #17354
Follow up to Issue #17354