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