issue #21855: Pull in fixes.