…nObserver-dev

merged upstream