Extend the dev branch

Extend the dev branch
Commit the dev branch again with extra file added

Commit the dev branch again with extra file added
Merge branch 'dev'