[Observe-commits] 01/01: Merge branch 'feature/7075' into develop