Backport to 4.14 and 4.19 commits 24c363623361 and 17ecffa28948 and a798a7086c38