Include the two new files
Merge branch 'origin/dev'