Observers begin
Merge branch 'master' into reference_consistency
Severak updates
e