[Jaxx-commits] [jaxx] 02/02: Merge branch 'feature/3305' into develop