Merge v4.2 branch into zplus