[Observe-commits] 02/02: Merge branch 'feature/7717' into develop