*commit 7f78e0351394052e1a6293e175825eb5c7869507
*latest 3.9.x only