issue #20212: Adjustments.