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