Accept pull request from develop_plot3d