Issue #20254 fix REST.