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