7 Commits (feature/controller-logging)