BZ-12229 Merge fix into release candidate.