Merge branch 'release/1.2.11'
Merge branch 'release/1.2.12'
Merge branch 'release/1.2.13'
Merge branch 'release/1.2.14'
Merge branch 'release/1.2.15'
Merge branch 'release/1.2.16'
Merge branch 'release/1.2.17'
Merge branch 'release/1.2.18'
Merge branch 'develop'
Create same file name for add/remove