changes for msml-gui
merge
changes for msml-gui