[WIP] Review objectives #36

Draft
Fred wants to merge 2 commits from review/objectives into master

2 Commits