To improve the Solution functionallity
Merge branch 'dev'