add feature-A
Merge branch 'feature-A'