Issue #16143