Adding new file to this feature
Merge remote-tracking branch 'origin/NewAwesomeFeature'