Merge "New control to load OBJ files" into devel/master