Merge to v4.4.5