Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r1895 -r1897
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1895)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1897)
@@ -72,8 +72,9 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Object:%CacheString]]></FormalSpec>
 <Implementation><![CDATA[
+	#define CalculatedPropertiesNotIncluded 0
 	set result = 1
-	set itProperties = ##class(TECH.ListIterator).%New(..GetProperties(Object.%ClassName(1)))
+	set itProperties = ##class(TECH.ListIterator).%New(..GetProperties(Object.%ClassName(1),$$$CalculatedPropertiesNotIncluded))
 	while result , itProperties.HasNext() {
 		set Property = itProperties.Next()
 		set PropertyValue = $zobjProperty(Object,Property)
@@ -85,7 +86,7 @@
 
 <Method name="GetProperties">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>ClassName</FormalSpec>
+<FormalSpec>ClassName:%String,IncludeCalculated:%Boolean=1</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	set listProperties = ##class(%ListOfDataTypes).%New()
@@ -94,6 +95,7 @@
 		set itProperties = ##class(TECH.ListIterator).%New(CompiledClass.Properties)
 		while itProperties.HasNext() {
 			set Property = itProperties.Next()
+			continue:('IncludeCalculated)&&(Property.Calculated)
 			do listProperties.Insert(Property.Name)
 		}
 	}