Broken 3D plot #2808

Merging Broken-3D-plot-#2808