Add missing merge conflict resolutions

When resolving merge conflicts in feature 67, several changes were made
but not committed. This hotfix contains those changes, to restore
functionality to the main development branch.