BUG: 443131 (cherry picked from commit cbef8e66)
mentioned in commit 401e11b4
mentioned in merge request !793 (merged)
mentioned in commit a303b3b0
mentioned in commit 8fb84c2f