solve 2176_For_the_Peace
Merge branch 'feature-2176'