Add header include missing after refactoring
Restore syntax for reporter control body, set status as removed.
Add warnings for deprecated or removed body types
Restore syntax for knowledge, set status as removed.
Merge remote branch 'upstream/master'