Merge pull request #4078 from afedchin/fix_gui_3d