Merge branch 'daniel/mr-fix'