[Observe-commits] 05/05: Merge branch 'feature/7608' into develop