[Observe-commits] 03/03: Merge branch 'feature/7605' into develop