Updated for issues #20259 and #20330