fork from v4.0.46