[PATCH 4.14 0/2] Backport fixes for 3226b158e67c