Merge branch 'daniel/merge-and-fixes'