ref #4028 - finalize gui, general fixes
Merge remote-tracking branch 'origin/master'