[Observe-commits] 04/04: Merge branch 'feature/7604' into develop