Add missed files and fix ASO configuration.
Merge pull request #4000 from HassenRiahi/AddMissedFileFixTemplate

Add missed files and fix ASO configuration.