story-3-fix: Refactored WadbceFileObserver.
Merge branch 'story-3-fix'