[~TASK] Refactoring of Observer
Merge remote-tracking branch 'origin/master'