Backport waiting for the master branch fix to be verified.
Assigning to Dan for progress tracking on the dependent bug + this one.
Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.
For information on the advisory, and where to find the updated
files, follow the link below.
If the solution does not work for you, open a new bug report.