finish discuss feature
Merge branch 'feature-discuss' into develop