…Observer-dev

merged from upstream