add 3acca1dd to 4.19-stable