XCAFDoc_ShapeTool::Expand method now avoids creation of subshapes under assemblies. XCAFDoc_ShapeTool::AddSubShape now avoids creation subshapes under all labels except for simple parts.