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