[Jaxx-commits] 03/03: Fixes #4033 Merge branch 'feature/4033' into develop