[Faxtomail-commits] 03/04: Merge branch 'feature/7420' into develop