[Observe-commits] 06/06: Merge branch 'feature/7708' into develop