Applied upstream commit a53c260564 locally, manually - refs BT#8024