Updates !1 with latest 4.0.x.
Issue #3159996
I do not know if this is a good candidate for the 4.0.x branch. Might want to bump it to 4.1.x.