merge v4.4.0 code