2.4.1i branch

Synch from real upstream.