the problem is described and resolved by 20919 which fix happened not to have got to
the release tree. Applying the patch of the parent bug.