Merge branch 'obs' into harmattan