[Observe-commits] 06/07: Merge branch 'master' into develop