Merge branch 'development'
Merge remote-tracking branch 'origin/master' into gui_improvements
start with ui changes for add cluster