Merge branch 'release/1.2.18' into develop
Remove / from manifest file name
Create same file name for add/remove
Merge branch 'develop'