8 Commits (fix/canonicals)