resolve some  conflict on 3d extension branch and sync develop to 3d branch