diff --git a/com.archimatetool.jasperreports/reports/Customizable Report/diagram_object.jrxml b/com.archimatetool.jasperreports/reports/Customizable Report/diagram_object.jrxml
index 895b9c09f..7c6a3026c 100644
--- a/com.archimatetool.jasperreports/reports/Customizable Report/diagram_object.jrxml	
+++ b/com.archimatetool.jasperreports/reports/Customizable Report/diagram_object.jrxml	
@@ -37,12 +37,12 @@
 	</columnHeader>
 	<detail>
 		<band height="16">
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Table row" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="257" height="16"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{name}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Table row" stretchType="RelativeToBandHeight" x="257" y="0" width="257" height="16"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{type}]]></textFieldExpression>
diff --git a/com.archimatetool.jasperreports/reports/Customizable Report/elements.jrxml b/com.archimatetool.jasperreports/reports/Customizable Report/elements.jrxml
index b280e4d9c..02819a257 100644
--- a/com.archimatetool.jasperreports/reports/Customizable Report/elements.jrxml	
+++ b/com.archimatetool.jasperreports/reports/Customizable Report/elements.jrxml	
@@ -33,7 +33,7 @@
 	</title>
 	<detail>
 		<band height="34">
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Normal" positionType="Float" x="0" y="0" width="515" height="16">
 					<property name="net.sf.jasperreports.export.pdf.tag.h2"/>
 				</reportElement>
@@ -55,12 +55,12 @@
 		</band>
 		<band height="32">
 			<printWhenExpression><![CDATA[$F{relation_source} != null]]></printWhenExpression>
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Table row" positionType="Float" x="150" y="0" width="365" height="16"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{relation_source}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Table row" positionType="Float" x="150" y="16" width="365" height="16"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{relation_target}]]></textFieldExpression>
@@ -85,12 +85,12 @@
 						<dataSourceExpression><![CDATA[((com.archimatetool.jasperreports.data.ElementsDataSource)$P{REPORT_DATA_SOURCE}).getPropertiesDataSource()]]></dataSourceExpression>
 					</datasetRun>
 					<jr:listContents height="16" width="515">
-						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+						<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 							<reportElement style="Table header" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="16" isRemoveLineWhenBlank="true"/>
 							<textElement/>
 							<textFieldExpression><![CDATA[$F{key}]]></textFieldExpression>
 						</textField>
-						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+						<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 							<reportElement style="Table row" positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="365" height="16" isRemoveLineWhenBlank="true"/>
 							<textElement/>
 							<textFieldExpression><![CDATA[$F{value}]]></textFieldExpression>
@@ -108,12 +108,12 @@
 						<dataSourceExpression><![CDATA[((com.archimatetool.jasperreports.data.ViewChildrenDataSource)$P{REPORT_DATA_SOURCE}).getPropertiesDataSource()]]></dataSourceExpression>
 					</datasetRun>
 					<jr:listContents height="16" width="515">
-						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+						<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 							<reportElement style="Table header" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="16" isRemoveLineWhenBlank="true"/>
 							<textElement/>
 							<textFieldExpression><![CDATA[$F{key}]]></textFieldExpression>
 						</textField>
-						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+						<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 							<reportElement style="Table row" positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="365" height="16" isRemoveLineWhenBlank="true"/>
 							<textElement/>
 							<textFieldExpression><![CDATA[$F{value}]]></textFieldExpression>
@@ -124,7 +124,7 @@
 		</band>
 		<band height="26">
 			<printWhenExpression><![CDATA[$F{documentation} != null]]></printWhenExpression>
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Documentation" positionType="Float" x="1" y="8" width="514" height="18"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{documentation}]]></textFieldExpression>
diff --git a/com.archimatetool.jasperreports/reports/Customizable Report/main.jrxml b/com.archimatetool.jasperreports/reports/Customizable Report/main.jrxml
index b5f7843e3..9b50f3345 100644
--- a/com.archimatetool.jasperreports/reports/Customizable Report/main.jrxml	
+++ b/com.archimatetool.jasperreports/reports/Customizable Report/main.jrxml	
@@ -105,7 +105,7 @@
 	</background>
 	<title>
 		<band height="600">
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Title" x="1" y="317" width="515" height="30" uuid="2d4ddc5a-2ceb-4009-8924-7162bf312526"/>
 				<textElement textAlignment="Left">
 					<font size="22"/>
@@ -191,7 +191,7 @@
 	<detail>
 		<band height="45">
 			<printWhenExpression><![CDATA[$F{name} != null]]></printWhenExpression>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+			<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 				<reportElement style="Normal" x="0" y="30" width="515" height="15" uuid="38784cb9-ab24-4fac-9438-ab7792b48648"/>
 				<textFieldExpression><![CDATA[$F{purpose}]]></textFieldExpression>
 			</textField>
@@ -219,13 +219,13 @@
 						<dataSourceExpression><![CDATA[((com.archimatetool.jasperreports.data.ArchimateModelDataSource)$P{REPORT_DATA_SOURCE}).getPropertiesDataSource()]]></dataSourceExpression>
 					</datasetRun>
 					<jr:listContents height="16" width="515">
-						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+						<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 							<reportElement style="Table header" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="16" isRemoveLineWhenBlank="true" uuid="61c6657c-7156-49a1-b0f3-4b5faaf93126">
 								<printWhenExpression><![CDATA[! $F{key}.startsWith("Report:")]]></printWhenExpression>
 							</reportElement>
 							<textFieldExpression><![CDATA[$F{key}]]></textFieldExpression>
 						</textField>
-						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+						<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 							<reportElement style="Table row" positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="365" height="16" uuid="3ee6d5f0-8af5-401b-a82f-682568f2efef">
 								<printWhenExpression><![CDATA[! $F{key}.startsWith("Report:")]]></printWhenExpression>
 							</reportElement>
diff --git a/com.archimatetool.jasperreports/reports/Customizable Report/view.jrxml b/com.archimatetool.jasperreports/reports/Customizable Report/view.jrxml
index c57661f82..e9b378191 100644
--- a/com.archimatetool.jasperreports/reports/Customizable Report/view.jrxml	
+++ b/com.archimatetool.jasperreports/reports/Customizable Report/view.jrxml	
@@ -82,7 +82,7 @@
 					<printWhenExpression><![CDATA[$V{REPORT_ENTRY} != 1]]></printWhenExpression>
 				</reportElement>
 			</break>
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Title 2" x="0" y="1" width="515" height="19"/>
 				<textElement textAlignment="Left" verticalAlignment="Bottom"/>
 				<textFieldExpression><![CDATA[$P{HIDE_VIEW_NUMBERING}.equals("true") ? $F{name}.replaceAll("^[0-9.]*  *", "") : $F{name}]]></textFieldExpression>
@@ -123,7 +123,7 @@
 				<textElement verticalAlignment="Bottom"/>
 				<textFieldExpression><![CDATA[$R{text.documentation}]]></textFieldExpression>
 			</textField>
-			<textField isStretchWithOverflow="true">
+			<textField textAdjust="StretchHeight">
 				<reportElement style="Documentation" x="0" y="38" width="515" height="16"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$F{documentation}]]></textFieldExpression>
@@ -152,14 +152,14 @@
 						<dataSourceExpression><![CDATA[((com.archimatetool.jasperreports.data.ViewModelDataSource)$P{REPORT_DATA_SOURCE}).getPropertiesDataSource()]]></dataSourceExpression>
 					</datasetRun>
 					<jr:listContents height="16" width="515">
-						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+						<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 							<reportElement style="Table header" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="16" isRemoveLineWhenBlank="true">
 								<printWhenExpression><![CDATA[!$F{key}.startsWith("Report:")]]></printWhenExpression>
 							</reportElement>
 							<textElement/>
 							<textFieldExpression><![CDATA[$F{key}]]></textFieldExpression>
 						</textField>
-						<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+						<textField textAdjust="StretchHeight" isBlankWhenNull="true">
 							<reportElement style="Table row" positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="365" height="16">
 								<printWhenExpression><![CDATA[!$F{key}.startsWith("Report:")]]></printWhenExpression>
 							</reportElement>
diff --git a/com.archimatetool.jasperreports/src/com/archimatetool/jasperreports/JasperReportsExporter.java b/com.archimatetool.jasperreports/src/com/archimatetool/jasperreports/JasperReportsExporter.java
index 62d6bfb7e..6264aa49d 100644
--- a/com.archimatetool.jasperreports/src/com/archimatetool/jasperreports/JasperReportsExporter.java
+++ b/com.archimatetool.jasperreports/src/com/archimatetool/jasperreports/JasperReportsExporter.java
@@ -99,7 +99,7 @@ public JasperReportsExporter(IArchimateModel model, File exportFolder, String ex
         fLocale = locale == null ? Locale.getDefault() : locale;
         
         // Stop logging
-        System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.NoOpLog");  //$NON-NLS-1$//$NON-NLS-2$
+        // System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.NoOpLog");  //$NON-NLS-1$//$NON-NLS-2$
     }
     
     /**