merge v4.2 with master