Merge branch 'feature/kvo-options' into develop
Fix detection of initial KVO observation