chore: update v4.x with changes from master #65

Closed pollend closed 3 years ago