[Jaxx-commits] 02/05: Merge branch 'release/2.21'