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