Merge "Follow-up to '3D' file type addition"