[Wao-commits] [wao] 02/05: Merge branch 'release/4.2'