diff --git a/Charts/Core/Testing/Data/Baseline/TestAreaPlot.png.md5 b/Charts/Core/Testing/Data/Baseline/TestAreaPlot.png.md5
index ca2687ba8530c4c0fd1960481def627048a1655d..ec70304c86468990d18f8f3ab4015509642fddeb 100644
--- a/Charts/Core/Testing/Data/Baseline/TestAreaPlot.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestAreaPlot.png.md5
@@ -1 +1 @@
-177bd117be463e49c4c292accf0f3f6e
+8987f6d71f63e5f82c8456a3b939839c
diff --git a/Charts/Core/Testing/Data/Baseline/TestBagPlot.png.md5 b/Charts/Core/Testing/Data/Baseline/TestBagPlot.png.md5
index c5fd3cab972774ec00c1bbb72609dd0ba264800b..053889e4af1e0b6414d30e8f6d2e343f52b2b40e 100644
--- a/Charts/Core/Testing/Data/Baseline/TestBagPlot.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestBagPlot.png.md5
@@ -1 +1 @@
-f1f8236e4066f5ce14c5b866d1020317
+21815c7f01cf7c792d3eb167fe067373
diff --git a/Charts/Core/Testing/Data/Baseline/TestBarGraph.png.md5 b/Charts/Core/Testing/Data/Baseline/TestBarGraph.png.md5
index 4c4496a014c86cf9a17fb7d42bbf9fb1eac9d832..d9eb53d8c1b0d63aebf037e1ff3acc321e81baad 100644
--- a/Charts/Core/Testing/Data/Baseline/TestBarGraph.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestBarGraph.png.md5
@@ -1 +1 @@
-a1dffc11a99c5de0d7894bd8212a16fd
+b9ebbbc55c68f6fa6a96711fae7fae03
diff --git a/Charts/Core/Testing/Data/Baseline/TestBarGraphHorizontal.png.md5 b/Charts/Core/Testing/Data/Baseline/TestBarGraphHorizontal.png.md5
index 00222a27bd0d7e410ef9fd7b1c11ff4eaffb45de..3f3c4cc916ac5c151d4cb4155a1c9767fd134ee1 100644
--- a/Charts/Core/Testing/Data/Baseline/TestBarGraphHorizontal.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestBarGraphHorizontal.png.md5
@@ -1 +1 @@
-7b26c11b65f9cb38d5fc34dad4f7995e
+0f06628534760cd1932a6b8d5e42309d
diff --git a/Charts/Core/Testing/Data/Baseline/TestBarGraphSelection.png.md5 b/Charts/Core/Testing/Data/Baseline/TestBarGraphSelection.png.md5
index 72310be6453964915acd500e6de9705cb97bd9f3..db63e8503f66cc7a7d94fb4f49ba0ff8c3767453 100644
--- a/Charts/Core/Testing/Data/Baseline/TestBarGraphSelection.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestBarGraphSelection.png.md5
@@ -1 +1 @@
-00044aaeeff1242ffae6a69705bf6380
+803c26f69ec6e0727ef1c0c3e79a46ef
diff --git a/Charts/Core/Testing/Data/Baseline/TestBoxPlot.png.md5 b/Charts/Core/Testing/Data/Baseline/TestBoxPlot.png.md5
index 1e5777a45965ee3012d3ce233e7e8cc258f3e559..8490a2d2198c7a55f38d1e499f240595155000bf 100644
--- a/Charts/Core/Testing/Data/Baseline/TestBoxPlot.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestBoxPlot.png.md5
@@ -1 +1 @@
-08dd93eb0237c2ffd089711e127bfff1
+bf84516a43f0b2f9e0752465cd1b13f2
diff --git a/Charts/Core/Testing/Data/Baseline/TestChartDouble.png.md5 b/Charts/Core/Testing/Data/Baseline/TestChartDouble.png.md5
index 9b9482e0ea7ba46656b42acbe3cdad1f7654613b..3f4eea30f6263136f2d16ea700187d982e1f6da5 100644
--- a/Charts/Core/Testing/Data/Baseline/TestChartDouble.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestChartDouble.png.md5
@@ -1 +1 @@
-b7b7055285612449c0c456658d63ad43
+9b0548cd55bcd6c4f2f5c499d57d3389
diff --git a/Charts/Core/Testing/Data/Baseline/TestChartDoubleColors.png.md5 b/Charts/Core/Testing/Data/Baseline/TestChartDoubleColors.png.md5
index 9fa2d857facdc8ab5198635a9c6ea1d1ce7dc4cb..fbe8981cdb3505ac2d319b1e29c8dade9a053dd0 100644
--- a/Charts/Core/Testing/Data/Baseline/TestChartDoubleColors.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestChartDoubleColors.png.md5
@@ -1 +1 @@
-38af8cbdffdf4d1a108400c324d0899e
+d23ed355133c128a749e28aa8828e3be
diff --git a/Charts/Core/Testing/Data/Baseline/TestChartMatrix.png.md5 b/Charts/Core/Testing/Data/Baseline/TestChartMatrix.png.md5
index 982d6054b53939c78cf51bc8e6cc107561c75e38..96f10f8a5221c763ce1428b154abf17742a87505 100644
--- a/Charts/Core/Testing/Data/Baseline/TestChartMatrix.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestChartMatrix.png.md5
@@ -1 +1 @@
-9a850f9714cc60876d69edc0bb08d5b0
+f7523ebf31ce8baae7b58f455b008e5b
diff --git a/Charts/Core/Testing/Data/Baseline/TestChartTileScaling.png.md5 b/Charts/Core/Testing/Data/Baseline/TestChartTileScaling.png.md5
index 20777ac51f39b212ef89a8b8011fa967327fb3b7..3537c83ba3a78767fe1592013daf147e88aea814 100644
--- a/Charts/Core/Testing/Data/Baseline/TestChartTileScaling.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestChartTileScaling.png.md5
@@ -1 +1 @@
-b1c73accbfc10292586f0f2963384b80
+81d5e3cfe55b96c735565bbf951e43f8
diff --git a/Charts/Core/Testing/Data/Baseline/TestChartUnicode.png.md5 b/Charts/Core/Testing/Data/Baseline/TestChartUnicode.png.md5
index 84297026d9a69b2f6655eba1e5a4dcffe01390f9..a1eacc42e207da3f5242663f6fa0565b063ae767 100644
--- a/Charts/Core/Testing/Data/Baseline/TestChartUnicode.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestChartUnicode.png.md5
@@ -1 +1 @@
-98b59db57cdb8906ed50670d07a87a2b
+5188f8239d0967bd33c1fa73778d53d5
diff --git a/Charts/Core/Testing/Data/Baseline/TestChartXYInvertedAxis.png.md5 b/Charts/Core/Testing/Data/Baseline/TestChartXYInvertedAxis.png.md5
index 8da3674ab354f03c54f052bb8e8b3ac10ca44c1f..dd1c826987e25f16e4accbec9f5116c86382c3b9 100644
--- a/Charts/Core/Testing/Data/Baseline/TestChartXYInvertedAxis.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestChartXYInvertedAxis.png.md5
@@ -1 +1 @@
-2ee5ef96d1759518b1847a4e48b35a5f
+7d7f5fe5f71b59db971f5ca42ab33433
diff --git a/Charts/Core/Testing/Data/Baseline/TestChartsOn3D.png.md5 b/Charts/Core/Testing/Data/Baseline/TestChartsOn3D.png.md5
index 01c5722a0a8297da53628e8f6a4a51d7710aecd0..1f387f5cb33293c36587e0899a52ff36c48223c2 100644
--- a/Charts/Core/Testing/Data/Baseline/TestChartsOn3D.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestChartsOn3D.png.md5
@@ -1 +1 @@
-214b8972d40722062fc38e67370277ac
+7e1bd0fd8be85c1c3acb56c096d16fa9
diff --git a/Charts/Core/Testing/Data/Baseline/TestColorTransferFunction.png.md5 b/Charts/Core/Testing/Data/Baseline/TestColorTransferFunction.png.md5
index c9e749628eedfa71383c2cf6fea0d3b536ddd29c..3e64c0bead0a05bd8bb8761f48ae14a723d6eb68 100644
--- a/Charts/Core/Testing/Data/Baseline/TestColorTransferFunction.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestColorTransferFunction.png.md5
@@ -1 +1 @@
-c5994ee130fb6f9e11785268c7083b1f
+a95b69a905e3fa51071dfd86801c6ee3
diff --git a/Charts/Core/Testing/Data/Baseline/TestContextArea.png.md5 b/Charts/Core/Testing/Data/Baseline/TestContextArea.png.md5
index 781827e4353852bca2fde128aee2d51b2c0f2907..3c93664faf800fe25e19a06ec01101ea51d3fc22 100644
--- a/Charts/Core/Testing/Data/Baseline/TestContextArea.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestContextArea.png.md5
@@ -1 +1 @@
-184553b310f2283682b8f014b41f0fc1
+18aea8567c8c48da409bd8df64b03568
diff --git a/Charts/Core/Testing/Data/Baseline/TestContextAreaFixedAspect.png.md5 b/Charts/Core/Testing/Data/Baseline/TestContextAreaFixedAspect.png.md5
index 5c1843805031f76acc075755099442469f44eeb3..70f6ec897c721f876b81602373a4df408534fd90 100644
--- a/Charts/Core/Testing/Data/Baseline/TestContextAreaFixedAspect.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestContextAreaFixedAspect.png.md5
@@ -1 +1 @@
-91808c3a637b9fbf9183bf09a1c26706
+adef24be631e4044473e4014d5b9ad77
diff --git a/Charts/Core/Testing/Data/Baseline/TestContextAreaFixedRect.png.md5 b/Charts/Core/Testing/Data/Baseline/TestContextAreaFixedRect.png.md5
index f726518874e98712e51b3536a4d4b1f972fc58f9..af029838501a502cdb76a3213fc6f06e6aaa16fa 100644
--- a/Charts/Core/Testing/Data/Baseline/TestContextAreaFixedRect.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestContextAreaFixedRect.png.md5
@@ -1 +1 @@
-7f3f6954db875c62242b414bfde0b7e8
+ce04192642fde42588172f4644681b32
diff --git a/Charts/Core/Testing/Data/Baseline/TestFunctionalBagPlot.png.md5 b/Charts/Core/Testing/Data/Baseline/TestFunctionalBagPlot.png.md5
index 4a0fe13a6a7bd1e9b583c59e4af441bc0ccb8b20..9bdcfbfcfb3987e2316c96d4d00202922f9d74e4 100644
--- a/Charts/Core/Testing/Data/Baseline/TestFunctionalBagPlot.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestFunctionalBagPlot.png.md5
@@ -1 +1 @@
-f674b816293f146d83d87c8dcb6e5383
+f1d2f258304220d0d1152b70fcda4c2e
diff --git a/Charts/Core/Testing/Data/Baseline/TestHistogram2D.png.md5 b/Charts/Core/Testing/Data/Baseline/TestHistogram2D.png.md5
index 2116cc1ae0e81ea9c5350093ba1c60015a69ed24..8ba05ac368ed0afb1f8d4f29bad6a18a7b4188a9 100644
--- a/Charts/Core/Testing/Data/Baseline/TestHistogram2D.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestHistogram2D.png.md5
@@ -1 +1 @@
-6dfef47ccee43e63802c1edcc673cab0
+2e62919bbe6ef3fecb6c613fbef79596
diff --git a/Charts/Core/Testing/Data/Baseline/TestInteractiveChartXYZ.png.md5 b/Charts/Core/Testing/Data/Baseline/TestInteractiveChartXYZ.png.md5
index f1ce2bf6bdd4874fbe0c2113956ecb3be75c0465..2403bf66defa4461418850ce5bdb89895bf45dd6 100644
--- a/Charts/Core/Testing/Data/Baseline/TestInteractiveChartXYZ.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestInteractiveChartXYZ.png.md5
@@ -1 +1 @@
-5487588b6d595d4561907648f85f916a
+093b335cc97c3218fb60beafb373cbae
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlot.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlot.png.md5
index 20ea157c9f0c4386d5c210b5659b49d8802e1133..b696b234b5a35222db08383fecd0fc70c1e608fd 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlot.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlot.png.md5
@@ -1 +1 @@
-9733be220d1d416ecda43b9a9c04f539
+292fc2108698adc96b4963f42a6fc889
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlot2.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlot2.png.md5
index 3558dd05151b3fab7b6ad132b1807c7f3ba8aa46..1a59e24e41e6b134371ad1cb30abbc43677bb162 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlot2.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlot2.png.md5
@@ -1 +1 @@
-e72ca9e8086c3d32200c3f246e3a5be0
+e8b91a00bfe5d633911493d78d4142ae
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotColors.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotColors.png.md5
index cfdb83aedc33a8c7e7f5d43413ba1d25ba2fbfca..05a3352c6b132cd162cd178e65a9b73e5896e97b 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlotColors.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotColors.png.md5
@@ -1 +1 @@
-4ebe59930fab8b44354ad3ddea39a687
+3b58dcbd917754ef963a1959074e6e10
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotColors_1.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotColors_1.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..2dc002ad0ad0d9b42bc3ba3f501f740055826904
--- /dev/null
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotColors_1.png.md5
@@ -0,0 +1 @@
+969ec66749b69b2aaaba7776fb50c513
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotDouble.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotDouble.png.md5
index 4d611b619d9d4ee1a0e6129fa47701630a946830..b93633da3f12680c68731810ee5e866b5e90f516 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlotDouble.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotDouble.png.md5
@@ -1 +1 @@
-878dac98f8dfdd7be1985179d2593cdc
+3647bd6777c5c9e9cfb7098d19ec321b
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotDouble2.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotDouble2.png.md5
index dcdeb0b7b3f510206bc11455cdd90d0115b70276..e5111b481067f7570169701a4b193c8fc4320f92 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlotDouble2.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotDouble2.png.md5
@@ -1 +1 @@
-66538857290b252e064f339a4d480ae4
+4c3120421364d4beedfa7a7570a858d7
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotInteraction.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotInteraction.png.md5
index e2747c14b6de800042ebdaa2e4727d5b509eba5d..28421133b9bda6aeee35bf2487ee40e85b93c097 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlotInteraction.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotInteraction.png.md5
@@ -1 +1 @@
-183b0843b6c6d15717bea9f47a942d41
+6966f5696adf2a9a3ae891c6e93f4802
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection.png.md5
index fa31af6cc1428e327a6b384d62646d6a347e8168..856ce315e0551ba89a1e9d02ca9653c3a191fb79 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection.png.md5
@@ -1 +1 @@
-68187b50e757da9e3801469652cb753f
+6b691e97233be3e56f9b7f29aebd1014
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2.png.md5
index 006247abc8ae612899300a116d8fafdc460dbb6e..57815a3c6d31ecc8c4d57908fdd7f410264bb874 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2.png.md5
@@ -1 +1 @@
-d82bf6adeed89c7905ea93f061731156
+0f06210adf91e59988a75ab1250ab41e
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2_1.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2_1.png.md5
index b8623ef67ce94c97ec6aac835de54742c004d611..4872dccba3b5ceee8502b9f60209ad86a44be061 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2_1.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection2_1.png.md5
@@ -1 +1 @@
-17020f1b46a2d6bdbed67abbef065b0c
+d695e5778661dae3a55388c046149c04
diff --git a/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection_1.png.md5 b/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection_1.png.md5
index 9e94a30e61dccdcbf00ec7480b7fc929f55f0c76..abe9bd6830620794b2cfda7925c75bcb5cfc79bc 100644
--- a/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection_1.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestLinePlotSelection_1.png.md5
@@ -1 +1 @@
-32e33a782041be03ced33784e1cb2a98
+a3c7a265e72eec60c4a1f114c933ec6b
diff --git a/Charts/Core/Testing/Data/Baseline/TestMultipleChartRenderers.png.md5 b/Charts/Core/Testing/Data/Baseline/TestMultipleChartRenderers.png.md5
index 659123653006eaa635c32cff99ffb23f74e6f373..1fc41b08ac667ffe6d7b3a585e6eccfc5acf2b84 100644
--- a/Charts/Core/Testing/Data/Baseline/TestMultipleChartRenderers.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestMultipleChartRenderers.png.md5
@@ -1 +1 @@
-188fd03bd16efdf766c0514167e039bc
+c6ff9134e056b361bd712b5841425b1f
diff --git a/Charts/Core/Testing/Data/Baseline/TestMultipleRenderers.png.md5 b/Charts/Core/Testing/Data/Baseline/TestMultipleRenderers.png.md5
index eefd54d080c8ee7a54c32d7df2505834699bfd8f..f4028644381000c5f876295183f1096c1bf4505d 100644
--- a/Charts/Core/Testing/Data/Baseline/TestMultipleRenderers.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestMultipleRenderers.png.md5
@@ -1 +1 @@
-268f49560d77178a83bcc4eedda5c634
+3ff74b248e6b060b6dfd1a4a1eb29c4b
diff --git a/Charts/Core/Testing/Data/Baseline/TestMultipleRenderers_1.png.md5 b/Charts/Core/Testing/Data/Baseline/TestMultipleRenderers_1.png.md5
index b509a8f57900628feed7a9aac24f65640de028d3..95bb28f033bcfec700a999068ab68b93d29a660d 100644
--- a/Charts/Core/Testing/Data/Baseline/TestMultipleRenderers_1.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestMultipleRenderers_1.png.md5
@@ -1 +1 @@
-e5678490f4330ee1ab8a2dd0afad1dd9
+c56573cf25ba5412cd36a2a90e19976f
diff --git a/Charts/Core/Testing/Data/Baseline/TestMultipleScalarsToColors.png.md5 b/Charts/Core/Testing/Data/Baseline/TestMultipleScalarsToColors.png.md5
index 0177d9718a5326e4b91fe4daeb54d3115d5e4277..399ace528141b5d65d05c23b967afde3c93afc18 100644
--- a/Charts/Core/Testing/Data/Baseline/TestMultipleScalarsToColors.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestMultipleScalarsToColors.png.md5
@@ -1 +1 @@
-9d2de86b4e58da13986fee8ad0ad8351
+1ef5bbd46f4b2f04419a876672e46845
diff --git a/Charts/Core/Testing/Data/Baseline/TestPlotMatrix.png.md5 b/Charts/Core/Testing/Data/Baseline/TestPlotMatrix.png.md5
index fb9b46ab5687943f38f359dc1671c63ee50d21b8..e030117f7a4cf4d441512667099d1f11b957289a 100644
--- a/Charts/Core/Testing/Data/Baseline/TestPlotMatrix.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestPlotMatrix.png.md5
@@ -1 +1 @@
-d37f82f68118ba55b9ec0016abee3ce7
+5a266a45291a42c7a5a9505fa96a3587
diff --git a/Charts/Core/Testing/Data/Baseline/TestPropItem.png.md5 b/Charts/Core/Testing/Data/Baseline/TestPropItem.png.md5
index 01da125f01bb577d36b02d33f51b96a5e0c207b7..d62a1cff7055060fda758ae78823f31c8e36de33 100644
--- a/Charts/Core/Testing/Data/Baseline/TestPropItem.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestPropItem.png.md5
@@ -1 +1 @@
-a8d3e1120eefc4785a7a2225ddfdea9f
+98d459397f09e5196b03e8fa23d32c77
diff --git a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScalarsToColors.png.md5
index 2121a3e07a4e7951db515f3c26254f91590b0d5e..a1404c41a0a4a6686851ee68e24ff8f95c411462 100644
--- a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestScalarsToColors.png.md5
@@ -1 +1 @@
-272891f5537f5cf70a03d5fc827b902e
+76f10c55826553bf155c8d0a6b069a0c
diff --git a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_1.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_1.png.md5
index ba5fa73ddf43c687f5cbeeb2613f1783236b4b51..29779a91014e924741c5b406592f8f2ebc900510 100644
--- a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_1.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_1.png.md5
@@ -1 +1 @@
-2e4eadc6096c5dbcebe721b1d7f2033e
+2791cc911f2e99bfcd0fc69b4d7a6e14
diff --git a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_2.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_2.png.md5
deleted file mode 100644
index eb77374c8f50a757e74669244acd8c2487680d2a..0000000000000000000000000000000000000000
--- a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_2.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-078ecabb9e6f6fcfc4ffc1797963a2a7
diff --git a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_3.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_3.png.md5
deleted file mode 100644
index 499a2d26c0334a2279d90f671f5be4a118d826f5..0000000000000000000000000000000000000000
--- a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_3.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-68914afd7f6bc94206651280a2fc19d0
diff --git a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_4.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_4.png.md5
deleted file mode 100644
index 7cf6d077ded280508e197b4a7d2131c007170227..0000000000000000000000000000000000000000
--- a/Charts/Core/Testing/Data/Baseline/TestScalarsToColors_4.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-1fbe4eaeb342d08407c48d0fc8cf3a25
diff --git a/Charts/Core/Testing/Data/Baseline/TestScatterPlot.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScatterPlot.png.md5
index 9c6abf0f90eb174937b027b0e94e4a59636c8dd6..cb1fdd22c940407972af8eb94fcc51429350d8f1 100644
--- a/Charts/Core/Testing/Data/Baseline/TestScatterPlot.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestScatterPlot.png.md5
@@ -1 +1 @@
-9eea8002e9169b898a30f52c5498e115
+eaa03b9227dcaa010b6a36acbebac3bf
diff --git a/Charts/Core/Testing/Data/Baseline/TestScatterPlotColors.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScatterPlotColors.png.md5
index 51de0fa2d0021f32da332c26c74ece01920e73ac..3d9ff335a466f54d2a741ff1336e3763e2d9074e 100644
--- a/Charts/Core/Testing/Data/Baseline/TestScatterPlotColors.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestScatterPlotColors.png.md5
@@ -1 +1 @@
-4d06dccbb5954dca5787e187289fd91d
+ef4480830a21e5c9b74e4caebe38cc3e
diff --git a/Charts/Core/Testing/Data/Baseline/TestScatterPlotMatrixVehicles.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScatterPlotMatrixVehicles.png.md5
index 09d7569f011d4517f5013f3c1695b10316e9d9ce..0c18b90276cc320ad6e7521b458cca098ae6b4ff 100644
--- a/Charts/Core/Testing/Data/Baseline/TestScatterPlotMatrixVehicles.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestScatterPlotMatrixVehicles.png.md5
@@ -1 +1 @@
-7049505b949330ad4c6dd36c1af7b8df
+41bb2c083aac29439c89b26980135cc4
diff --git a/Charts/Core/Testing/Data/Baseline/TestScatterPlotMatrixVehicles_1.png.md5 b/Charts/Core/Testing/Data/Baseline/TestScatterPlotMatrixVehicles_1.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..ddea223e2b6c217c9e4311175018d3c03c49c129
--- /dev/null
+++ b/Charts/Core/Testing/Data/Baseline/TestScatterPlotMatrixVehicles_1.png.md5
@@ -0,0 +1 @@
+27619b2fbc7f62e8ebfae96f6a3ed39b
diff --git a/Charts/Core/Testing/Data/Baseline/TestStackedBarGraph.png.md5 b/Charts/Core/Testing/Data/Baseline/TestStackedBarGraph.png.md5
index 544e412ebddf90790dbe48ecc064c1515590168b..7f11bc0404b603dd64f4d8a42477fcfa478f25a7 100644
--- a/Charts/Core/Testing/Data/Baseline/TestStackedBarGraph.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestStackedBarGraph.png.md5
@@ -1 +1 @@
-db5b22ac4e57d859410a9aeca1ba706b
+f87805ea7113fe5c1d8dceb327742b06
diff --git a/Charts/Core/Testing/Data/Baseline/TestStackedPlot.png.md5 b/Charts/Core/Testing/Data/Baseline/TestStackedPlot.png.md5
index aa04e9ebbf75d848db55ef8b93311849fc3e004e..e862d277b9db83217a0c3c6b29c826b89ce7337f 100644
--- a/Charts/Core/Testing/Data/Baseline/TestStackedPlot.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestStackedPlot.png.md5
@@ -1 +1 @@
-3f7e3acf6d2e78a4084218979b41068d
+d7780e616782105c9cd50238b9afcdb6
diff --git a/Charts/Core/Testing/Data/Baseline/TestSurfacePlot.png.md5 b/Charts/Core/Testing/Data/Baseline/TestSurfacePlot.png.md5
index 5db8d411e789450ad6e16be6d11ec3dbbfe236ee..7bc268d92fbf7c7128ed65bf24596856341f661a 100644
--- a/Charts/Core/Testing/Data/Baseline/TestSurfacePlot.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestSurfacePlot.png.md5
@@ -1 +1 @@
-84248d244fdb99a6e6033c730ab01dd9
+62856cc5e6a5a25329f7d147b4e841a3
diff --git a/Charts/Core/Testing/Data/Baseline/TestZoomAxis.png.md5 b/Charts/Core/Testing/Data/Baseline/TestZoomAxis.png.md5
index 50165f3830989dafa7c153ae03671c21954d0030..242d5de081f606480fa8d110b2f8ac43e6978d54 100644
--- a/Charts/Core/Testing/Data/Baseline/TestZoomAxis.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestZoomAxis.png.md5
@@ -1 +1 @@
-78536392754a59b91c609386a0813efc
+40118c94b3b8d3a5cefb5d7c39f963e0
diff --git a/Charts/Core/Testing/Data/Baseline/TestZoomAxis_1.png.md5 b/Charts/Core/Testing/Data/Baseline/TestZoomAxis_1.png.md5
index 234dc313460d91a05998d65ef29b2ef42b306f07..ee4b9232e0d77ace884e30cfe362f2805e57be77 100644
--- a/Charts/Core/Testing/Data/Baseline/TestZoomAxis_1.png.md5
+++ b/Charts/Core/Testing/Data/Baseline/TestZoomAxis_1.png.md5
@@ -1 +1 @@
-e268742c63a67a605347204a388e73fa
+63732833f741c5fa2d7164a10c5d3c07
diff --git a/Common/ComputationalGeometry/Testing/Data/Baseline/TestMoreParametricFunctions.png.md5 b/Common/ComputationalGeometry/Testing/Data/Baseline/TestMoreParametricFunctions.png.md5
index 4ff37d97df9e9d483c20c74c1fd3123c98c586b7..961d3a78b675d304e1c7e5056df3bfb2bc8f70bc 100644
--- a/Common/ComputationalGeometry/Testing/Data/Baseline/TestMoreParametricFunctions.png.md5
+++ b/Common/ComputationalGeometry/Testing/Data/Baseline/TestMoreParametricFunctions.png.md5
@@ -1 +1 @@
-c1c1a5241476cbd4807c5d983eacda04
+a20c3cf9fdca9ea6f984eb03868a5d09
diff --git a/Common/ComputationalGeometry/Testing/Data/Baseline/TestParametricFunctions.png.md5 b/Common/ComputationalGeometry/Testing/Data/Baseline/TestParametricFunctions.png.md5
index eb8c02444c9cb9013b5103ea6071bae75bb8db49..44b80780cab98aade684a10d90b257e5c55cf8e8 100644
--- a/Common/ComputationalGeometry/Testing/Data/Baseline/TestParametricFunctions.png.md5
+++ b/Common/ComputationalGeometry/Testing/Data/Baseline/TestParametricFunctions.png.md5
@@ -1 +1 @@
-b20c642fc0a5d402a56b873d6855c3ce
+12189e3e2faacbb10b1cdaf2a7a6217f
diff --git a/Filters/Points/Testing/Data/Baseline/PlotSPHKernels.png.md5 b/Filters/Points/Testing/Data/Baseline/PlotSPHKernels.png.md5
index 18cae6e8ee8e1f3249ae1d538a71de5a796c6b9f..899a10b816c3f5f7d1e055020cb1599b1d8b79a5 100644
--- a/Filters/Points/Testing/Data/Baseline/PlotSPHKernels.png.md5
+++ b/Filters/Points/Testing/Data/Baseline/PlotSPHKernels.png.md5
@@ -1 +1 @@
-2b6cca57fc16b65edbaff6285b1baf12
+5618fa4422a63989c3e3c9118b6aa81b
diff --git a/Filters/Points/Testing/Data/Baseline/PlotSPHKernels_1.png.md5 b/Filters/Points/Testing/Data/Baseline/PlotSPHKernels_1.png.md5
index 4476d414ad99dbde112cd4dc7fff40342d4558a4..44b3373a17e478a62a177ed27c5d841ab255d380 100644
--- a/Filters/Points/Testing/Data/Baseline/PlotSPHKernels_1.png.md5
+++ b/Filters/Points/Testing/Data/Baseline/PlotSPHKernels_1.png.md5
@@ -1 +1 @@
-f3da3527c909cc8a5b2a10d4bc779742
+f1ec63d0866c570c548c59ee8e18be24
diff --git a/Filters/Points/Testing/Data/Baseline/PlotSPHKernels_2.png.md5 b/Filters/Points/Testing/Data/Baseline/PlotSPHKernels_2.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..834fbe2b239e806141b98f3cd80e13efb962327f
--- /dev/null
+++ b/Filters/Points/Testing/Data/Baseline/PlotSPHKernels_2.png.md5
@@ -0,0 +1 @@
+079f6ee8a2326378ed093d7444ffb07d
diff --git a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5 b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5
index 36fe6bb5f7028316edbcdc0143287791a0cb82b5..b38bb09b01c68815b6a5f61729aca1a228f7d6fa 100644
--- a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5
+++ b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D.png.md5
@@ -1 +1 @@
-0087f914e60fafcad8b2a720bda407d1
+2462f5b7ef1bfef2d2f4665f16504ef6
diff --git a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5 b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5
index 91b0f8a5366c5414397ec41b66cb720a84c85099..2ba66a0663e34649787c8a78c44574b2047218ff 100644
--- a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5
+++ b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_1.png.md5
@@ -1 +1 @@
-a237e17712a183b6e3f3e4d839774790
+afc643c12bbe41776ff27c0a3cafba08
diff --git a/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_2.png.md5 b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_2.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..9aa4eaf32f7cee20b18949e2ce2a3de9d4fb4b03
--- /dev/null
+++ b/Geovis/Core/Testing/Data/Baseline/TestLabeledGeoView2D_2.png.md5
@@ -0,0 +1 @@
+809560b4906411568b3f1217b962c12c
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef.png.md5
index 34b8a4836c51afcc386488ad42e60fb82a50335d..1e7681bd395210a550c02b8823c8ce28ee3ff355 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef.png.md5
@@ -1 +1 @@
-35a0d7162b58f1706ad19681aecc5099
+c06830f37a6a19df0695e572171342d0
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef_1.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef_1.png.md5
index 5dd32e95d28905d1f122c741d32c1607fddb6004..6d00015d4868609b4d9110ba04dc9ef77f77a3d7 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef_1.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster-rasterRef_1.png.md5
@@ -1 +1 @@
-ec862b727e65bc9d89ea7b982cd8d21c
+22448b878dfc24eb8785411aa758a6b9
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster.png.md5
index e7afdb5c87fce07c3ef2405574e1c735b351b157..9a61e6785cec775e3c63a2866b346c2d86057cef 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterRaster.png.md5
@@ -1 +1 @@
-74fc0165820f613d07221be87112fb54
+2e3b96c79aa9ba70a10792a1789e695e
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster-rasterRef.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster-rasterRef.png.md5
index a598b89a30f793ce2070a877e02d9f1658898f48..8da87a55f858a1215e61ef1077c6c8ae37f0bd3b 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster-rasterRef.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster-rasterRef.png.md5
@@ -1 +1 @@
-e225412e93cbc0756ea030394da5f049
+c06b44b6a2b32be296edb52f18f5b23b
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster.png.md5
index 37cbc376cffa5742fe92640ea4570bce291d2320..bf101a9315792d58921ab56e77390fa57e457b6c 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSExporterVolumeRaster.png.md5
@@ -1 +1 @@
-ded21dec53749c2bb5dcf23ffd8a7fe4
+2ddabd331b4ff2fcdfed7b0202495e35
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef.png.md5
index f8be014543672fbce7d14f39294b03659e6cde9b..1d10c6d6279f70724cb33ba25c63a2f69f10b6db 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef.png.md5
@@ -1 +1 @@
-99f8713d371bd6bdbcf52eb019fd792c
+44875ba5aa7a8f87a95d44ea28a8e93c
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_1.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_1.png.md5
index 0024789c203b646150220dc030944c09b805a3cf..5a0e1e15f099327a2ddab3d1e7e5ebc92670274f 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_1.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_1.png.md5
@@ -1 +1 @@
-2a358f9fe51f05a7104b0f0089035a7b
+efe5aadb10754107d294a580f8d342c3
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_2.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_2.png.md5
deleted file mode 100644
index bcc79547a5c9841c14747b8cadadb2da360448cd..0000000000000000000000000000000000000000
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_2.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-c24d1076d4f6d127d2713935eec81522
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_3.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_3.png.md5
deleted file mode 100644
index e085afd92fb5479dab3b12f1455171d110183fc3..0000000000000000000000000000000000000000
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar-rasterRef_3.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-0d83c0b70bd4e50a9bf60554a5ddedef
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5
index ce6595b3fd1803c73f67055117ddff8fca855c59..518fdb17260e4d7570364db876c878c3489e2d8c 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar.png.md5
@@ -1 +1 @@
-f386acf23fcbddb7032d4f6573798236
+c647e9e29b22908b01a4747d635b2ef3
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar_1.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar_1.png.md5
deleted file mode 100644
index 608d9a498b6413f6b12386432512158c33b2103c..0000000000000000000000000000000000000000
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar_1.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-b37027124b6be375e5fa6183c00f040c
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar_2.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar_2.png.md5
deleted file mode 100644
index ae996282799111859e99874a31f1a9d46adf9b04..0000000000000000000000000000000000000000
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSScalarBar_2.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-5f7752f820edcce2d68aa5c9ca0c185c
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor-rasterRef.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor-rasterRef.png.md5
index 553af2d6cc8a4a7459575eda239496a12b11c772..8676ac01d7946fa4582ceef2be56bcbdf300b2ba 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor-rasterRef.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor-rasterRef.png.md5
@@ -1 +1 @@
-2c6afa48066111eea67dbe03cf5ebaf2
+b6863109224d0cf49713846746e32651
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor.png.md5
index fb19e5cfc2dce4ea1aa6ad9ae0d88825ebd3541d..82a18460da25e0d8e51d62ca310f862df92157e9 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor.png.md5
@@ -1 +1 @@
-3c1f1475164cc67fb8d5283639f41f16
+a8f72beed72517307830c90a8fe32e14
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor3D-rasterRef.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor3D-rasterRef.png.md5
index e6d121dd65b4386b96d44b12483684d241ce8ca0..e008c319cfb49e16ef7e19badcfea6be37c6c5fd 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor3D-rasterRef.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor3D-rasterRef.png.md5
@@ -1 +1 @@
-ba78fc0526c3263f7674deb02fd51b9f
+ba73e5caf36009fa22fdfd36f14a27d0
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor3D-rasterRef_1.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor3D-rasterRef_1.png.md5
deleted file mode 100644
index c141d38c51de18a4e666158326b6b6b9510272d8..0000000000000000000000000000000000000000
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSTextActor3D-rasterRef_1.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-5098cd8250661eeee5bca712c07fe6cc
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper-rasterRef.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper-rasterRef.png.md5
index fe8aca5c9c26abd1e04b46c3c266237e69531163..d2504c65f255ed4e289cea0a75de8670075bb415 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper-rasterRef.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper-rasterRef.png.md5
@@ -1 +1 @@
-653fa14d2d880476c306dccd9a7472b2
+2c5d6874473f06a82a292033fe5d6a52
diff --git a/IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper.png.md5 b/IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper.png.md5
index 8478fee2ad870aba6fef53058e4b3e3d03639fa6..34f8c07d5b42e95c6c812e26102a0d67099c735e 100644
--- a/IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestGL2PSTextMapper.png.md5
@@ -1 +1 @@
-732debf9bdfc5095510710bbc9d02c5c
+2d649b1caa966c219d95c82cb170a66b
diff --git a/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS-rasterRef.png.md5 b/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS-rasterRef.png.md5
index d645d712099c33ddb49f079b69e141c4900e58bb..189aa39e05fd5cec03781f03b10f0efaa8e0ddea 100644
--- a/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS-rasterRef.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS-rasterRef.png.md5
@@ -1 +1 @@
-da420f1c8ef140134e39b325d5b7567f
+8fd31aa0c21f93ba3f09e8985b8b8066
diff --git a/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS.png.md5 b/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS.png.md5
index f187b03e6922536254c0120d50b25be1973d70bc..338890ef4c536843639b6852820d3a161679e290 100644
--- a/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS.png.md5
@@ -1 +1 @@
-94c04e226b6f59046c9d71c5c251d8c5
+54efd3f6b4ad6dfc02314fef272ce641
diff --git a/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS_1.png.md5 b/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS_1.png.md5
deleted file mode 100644
index a54ce5568e5b1ace3f9dd2f4ed9afbeb6ff39561..0000000000000000000000000000000000000000
--- a/IO/Export/Testing/Data/Baseline/TestLinePlotGL2PS_1.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-ca8cb0b30dfce2da920ae477aac4096d
diff --git a/IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS-rasterRef.png.md5 b/IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS-rasterRef.png.md5
index 4a3bbce3197a328bc981a6bfbd52b57681ace3c7..d35c2afb01fbefd2d8460cb78449afb77211c06c 100644
--- a/IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS-rasterRef.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS-rasterRef.png.md5
@@ -1 +1 @@
-5e5e9fcb766b57bc8940892cf0a54c95
+27d0437b4c69de362ed1ac4daf9d144f
diff --git a/IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS.png.md5 b/IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS.png.md5
index f5851a169c2ef8afd005ce362b1581fa47bd2cac..e4a344969a1a17f5f63ec5708162b14670b35dff 100644
--- a/IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS.png.md5
+++ b/IO/Export/Testing/Data/Baseline/TestStackedPlotGL2PS.png.md5
@@ -1 +1 @@
-edcf235af616e7087f11f2ce90f617d7
+9b4709cad3077910e6a1a8f3e68b516f
diff --git a/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterRasterExclusion.png.md5 b/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterRasterExclusion.png.md5
index 481db92f2bf56dc9914d1626c12180940d90404f..1490fdde9c438447327630f428266bd2de25392f 100644
--- a/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterRasterExclusion.png.md5
+++ b/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterRasterExclusion.png.md5
@@ -1 +1 @@
-17712695013e9f093d7a91dfb13ba2ec
+94cc894ae6b7d2172b7f5cedaf46887a
diff --git a/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector-rasterRef.png.md5 b/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector-rasterRef.png.md5
index 2f8781d8d31d3b67c53614437b4c9e2cfe959e69..12c4965e040e7bff5d6aca68c2ef15a15d6e1068 100644
--- a/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector-rasterRef.png.md5
+++ b/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector-rasterRef.png.md5
@@ -1 +1 @@
-a793f0ffb3ee8f346aa138dcbcd8765a
+32c688d77c67172a8b7a2f3f18a35a38
diff --git a/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector-rasterRef_1.png.md5 b/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector-rasterRef_1.png.md5
deleted file mode 100644
index e6e6de1a83a1e8c0a0ec14ffa2f6f083881e491b..0000000000000000000000000000000000000000
--- a/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector-rasterRef_1.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-cdc4cfb58c6185ae500a815cbd007d76
diff --git a/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector.png.md5 b/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector.png.md5
index e7afdb5c87fce07c3ef2405574e1c735b351b157..df81db70def6c0c83ff0e11eeb14ea6e1b750b15 100644
--- a/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector.png.md5
+++ b/IO/ExportOpenGL/Testing/Data/Baseline/TestGL2PSExporterVector.png.md5
@@ -1 +1 @@
-74fc0165820f613d07221be87112fb54
+5bceb8274497f9d305b9a0faaa3e4dcf
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestParallelopipedWidget.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestParallelopipedWidget.png.md5
index be233e16b20d820b8b0ad77407343e8f42bb5345..f316949b63b3294516e4162b18b5409150e05b97 100644
--- a/Interaction/Widgets/Testing/Data/Baseline/TestParallelopipedWidget.png.md5
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestParallelopipedWidget.png.md5
@@ -1 +1 @@
-eb54be77de7d45a06fd8e54b4179fe15
+563b0370297514cd8f5295304b1ce609
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSliderWidget2D_1.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSliderWidget2D_1.png.md5
index 0f0e0fefca1da44c61a8d0456c2f4f0bd244dec7..90432725f11a6bea8f651bdf553b723b26ced858 100644
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSliderWidget2D_1.png.md5
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestSliderWidget2D_1.png.md5
@@ -1 +1 @@
-4f5580f0ba97b35308338f67317090b1
+d4e168b80933bc2a57d28ec250efd8c1
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor.png.md5
index c5d8956c93af3d5e91df672decbfd8713f514bf0..dec8ef9423e70f2d60be91972f3ff72c12bbfada 100644
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor.png.md5
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor.png.md5
@@ -1 +1 @@
-89d22601180d4d862d79cf5b1ff2824f
+a6efb83a441b9f823818a9e2e80397b3
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_1.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_1.png.md5
index 5c6b14b4c259da576bcfc172787acf3409d0b03a..5b72aafa1b58c23addc9cbe2c2577f1d88ef76ff 100644
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_1.png.md5
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_1.png.md5
@@ -1 +1 @@
-7efdd8f7dd4ce3157bfc03ceb660aed3
+fa817678199ff9cd7102d769514a17f4
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_2.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_2.png.md5
deleted file mode 100644
index 57f8953e6a9076f31df7df853069be9a35ad0476..0000000000000000000000000000000000000000
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_2.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-75d7e05721ba3bfa5244b618684f4692
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_3.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_3.png.md5
deleted file mode 100644
index 79236a032bcdc3a5b8ccd79980ce7b6da27a4200..0000000000000000000000000000000000000000
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_3.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-37f886b659c65924c0e3bd7426c73a30
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_4.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_4.png.md5
deleted file mode 100644
index 456155a30664fdc043445d14adb188acf7f288ac..0000000000000000000000000000000000000000
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_4.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-e234e8e2b6a2ce1792821c3ef20b0190
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_5.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_5.png.md5
deleted file mode 100644
index 7e614d18f832da4087bab2418f9b4806a0474e07..0000000000000000000000000000000000000000
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_5.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-97d0f5a2607f5013f2df0f19d1e7a748
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_6.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_6.png.md5
deleted file mode 100644
index 79236a032bcdc3a5b8ccd79980ce7b6da27a4200..0000000000000000000000000000000000000000
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_6.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-37f886b659c65924c0e3bd7426c73a30
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_7.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_7.png.md5
deleted file mode 100644
index 6edcee6fe24bd1ea13d1b87f7a4f3acfee5783b2..0000000000000000000000000000000000000000
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_7.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-c47deb713b623a6bb2edbde1a0914a0a
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSplineWidget.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSplineWidget.png.md5
index 0cb65d18d230316522342225dfc46c4799777803..97d78aea3d1cfbbd84e7294ba917789e1e5e8b76 100644
--- a/Interaction/Widgets/Testing/Data/Baseline/TestSplineWidget.png.md5
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestSplineWidget.png.md5
@@ -1 +1 @@
-3b929d447a109e4832b7ef89c9a7b84b
+4e08befe60f210cb39b2af4dd4e5b2d2
diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSplineWidget_1.png.md5 b/Interaction/Widgets/Testing/Data/Baseline/TestSplineWidget_1.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..f71a0b0184cfdc76563e3a26c9c19d5ddf78c4c3
--- /dev/null
+++ b/Interaction/Widgets/Testing/Data/Baseline/TestSplineWidget_1.png.md5
@@ -0,0 +1 @@
+53635fe142ed031ed9e3eee00b5b9a76
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor.png.md5
index c5249ee9ec7b20b576415389c56e9290aa787e15..7afe89fb98c1ebc56bb13c0079b6a19504d33f8f 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor.png.md5
@@ -1 +1 @@
-c3eb6bd658da220fe45ab75ed022b543
+0d23c1cfdf788825851d78b3e354988f
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_1.png.md5
index c310729e8c2c620a02c0d7cae38d245d2074d8c9..b16af828969dde6d61b7fec16ab0a3cfa5583dbb 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_1.png.md5
@@ -1 +1 @@
-5a4f59aefa73419fc065da8c4027be77
+c82b7477664bb26f28f24204d4fa67cd
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestCornerAnnotation.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestCornerAnnotation.png.md5
index 8d607ae3b7f97bca9ca3368dc41a1719d86adbb3..9b5f7b9f234f43805a8a0b381d9ed41ea17f425b 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestCornerAnnotation.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestCornerAnnotation.png.md5
@@ -1 +1 @@
-e152ee480a291a7717edb72a5fac09a7
+c47f9ee0bd2e9f26a47da95325e0bc5f
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor.png.md5
index 6720a2f0cff130cf439152a5d12b3dfdba868d4a..3570bf1c89b75447bbc5cf7e9ee05149d5f5289e 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor.png.md5
@@ -1 +1 @@
-649dcabbd3ba870d3249fa077b606d13
+9f2864989fe1f4a549c7b4e611f2dbd8
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2.png.md5
index 2e3739731a0833f52495bf052654ba3a1d989f83..8a3557de82706626d439b6cc1f1c85eee4f98c24 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2.png.md5
@@ -1 +1 @@
-7288b21a1c59b4d9890b39215610dbef
+ed4cc472f60c9f34af778675e9cc404f
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_1.png.md5
index 6f75eb6ee380f87379b1d317527a74917d638147..fa684463cfeccff9d143f12eafc95e46b8596901 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_1.png.md5
@@ -1 +1 @@
-e848ae26d954d739d489eb60923f5fae
+205a05d3b45f199095dd74c504a32f3d
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_1.png.md5
index e28cd1c6a0456691150d516f6fa0b2e3c5c7d014..3f10edaf67814782dade8826dba13e476dd01e03 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_1.png.md5
@@ -1 +1 @@
-8df4ac3a93e967582ca9d744b5e786a2
+291666621990da1c26cc57ec0676af01
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor.png.md5
index a1567b6844367ac07d1852a25bd26a0a0eb0f9b4..e14f3ff2acaaf5544a40ab849969ca5b35dac887 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor.png.md5
@@ -1 +1 @@
-9a82661b11e14f7f620b2af79ead0851
+39027fcd8c93b5dac7d612fa87f9497f
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar.png.md5
index 18e6b9fdb1877a4b66f2d433839ac6a2850d4e9d..4ef194523c0cad128d35354f03122f9c9e8232f6 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar.png.md5
@@ -1 +1 @@
-4026c990e1f710d2b54e7c89515948ee
+813864a9dfbae02d0d6d2b919caa3a6b
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBarAboveBelow.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBarAboveBelow.png.md5
index da70ff403ad073fa9841f7dbc9ce45d5662aacca..0856df2c65e34efba2521f14a46470390533113f 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBarAboveBelow.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBarAboveBelow.png.md5
@@ -1 +1 @@
-d4b58d570c06bc884819c7e8487dd055
+f438f95c66110e62536a22d5e3f33bd0
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_1.png.md5
index 8a650a24e41c79b6a362d000be2a14249d02be21..e45e0fd41a013954da6fc47289d6c9ac21fa1b56 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_1.png.md5
@@ -1 +1 @@
-c0a54530fe34623d91e6e4fe062a2400
+b5ec06f6a53b2a000f81ddcedbadca67
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_2.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_2.png.md5
deleted file mode 100644
index 608d9a498b6413f6b12386432512158c33b2103c..0000000000000000000000000000000000000000
--- a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_2.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-b37027124b6be375e5fa6183c00f040c
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor.png.md5
index 40ac9a9a27ef3131e630dbb6aab6a17982f9559d..3bc96d8b2f76b2800d9967d99d6e04eca48e9e91 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor.png.md5
@@ -1 +1 @@
-78fee8561231415c57d2198267fda8af
+db79c7d7b46739728187ec52a07f574e
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor_1.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..59416c5189bb57d566688589bf4e2608bb5a4390
--- /dev/null
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor_1.png.md5
@@ -0,0 +1 @@
+cba07bfb8fb8360f27d6a81bf82f0320
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor.png.md5
index 34417d412ffb869635fff147f092bf899006c2cb..e58f235519a2cb29e760ad1f836f978db50cf0c8 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor.png.md5
@@ -1 +1 @@
-cee403d44e508721e173a434f43c5c8b
+6984ec6dfa94123bab19400236729c9e
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_1.png.md5
index 52338ccec9a134e5a207f45d2b1e227113bfb5a1..bc67aecec330423d6e367bf2de5509a6887a629b 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_1.png.md5
@@ -1 +1 @@
-cb2d066c25100384fd8041c92be67473
+28a793082d452258373a87359d1d234c
diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_2.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_2.png.md5
deleted file mode 100644
index 189f8f6da1186ac053b983cfcf6d05d9a6ba855c..0000000000000000000000000000000000000000
--- a/Rendering/Annotation/Testing/Data/Baseline/TestXYPlotActor_2.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-0c506679a90798d265ea39589cc7ede3
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot.png.md5
index 37e5f75ae7dd4a40b541f4236f15f77c891e073a..eee34468b151e79b5b59017504fec1a28cbaea8d 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot.png.md5
@@ -1 +1 @@
-3c7cc0e255587e1d6448ac10917bbade
+de898d9a86b55cddb7eff607f758f272
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2.png.md5
index f7b4a3e7d25ba4b72d79ac295544cb1f01d93ed0..808846e20394cab684d7893589b63ac66d0e782e 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2.png.md5
@@ -1 +1 @@
-d0c7450aeb92c82ed09f4225dc3b332c
+1cf0e6c359e27d4de076fd23e7bd3e79
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_1.png.md5
index 19dfa598e5f36e8e4c373c39f22dc9cbc537f5c4..c303192d6fa6c2e23fd6bf27f468037075b4b720 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_1.png.md5
@@ -1 +1 @@
-b76ef3e2ab1fc094cb535aa7b46d7e18
+9fbfd4e4ed7399c4da79ee7d834929eb
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot3.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot3.png.md5
index 496bde6da20d5ad57d27fd3cd1108445e3603b1b..3bcf60838f0d9d1e0bc578d815b42e774326514e 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot3.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot3.png.md5
@@ -1 +1 @@
-07750215c24a941e83fd37e5641d82c5
+dcab27d8ba3595d72810f4a49e2f8071
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4.png.md5
index f7b4a3e7d25ba4b72d79ac295544cb1f01d93ed0..808846e20394cab684d7893589b63ac66d0e782e 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4.png.md5
@@ -1 +1 @@
-d0c7450aeb92c82ed09f4225dc3b332c
+1cf0e6c359e27d4de076fd23e7bd3e79
diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_1.png.md5 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_1.png.md5
index 19dfa598e5f36e8e4c373c39f22dc9cbc537f5c4..c303192d6fa6c2e23fd6bf27f468037075b4b720 100644
--- a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_1.png.md5
+++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_1.png.md5
@@ -1 +1 @@
-b76ef3e2ab1fc094cb535aa7b46d7e18
+9fbfd4e4ed7399c4da79ee7d834929eb
diff --git a/Rendering/Core/Testing/Data/Baseline/TestLabeledContourMapper.png.md5 b/Rendering/Core/Testing/Data/Baseline/TestLabeledContourMapper.png.md5
index 9caf36f78fa1122b3cda095a6b089f6b3abce036..9e114fb69630d982895fc6fd2eafa84ddeaecfe3 100644
--- a/Rendering/Core/Testing/Data/Baseline/TestLabeledContourMapper.png.md5
+++ b/Rendering/Core/Testing/Data/Baseline/TestLabeledContourMapper.png.md5
@@ -1 +1 @@
-0ff03f5ecd5e149cb9c0606b26e1c021
+f4080b5c03ddec0de1a140c247abbc6c
diff --git a/Rendering/Core/Testing/Data/Baseline/TestLabeledContourMapperWithActorMatrix.png.md5 b/Rendering/Core/Testing/Data/Baseline/TestLabeledContourMapperWithActorMatrix.png.md5
index 0f802d2242254dfa5993901b4cf0c5df0ff41a49..6a14f8cc29db099ce842bb0267ff8f340f853e21 100644
--- a/Rendering/Core/Testing/Data/Baseline/TestLabeledContourMapperWithActorMatrix.png.md5
+++ b/Rendering/Core/Testing/Data/Baseline/TestLabeledContourMapperWithActorMatrix.png.md5
@@ -1 +1 @@
-ce458c3baaaf836dfd4d21ad530817a2
+9d5d8e853913d5347808aa8ca6979887
diff --git a/Rendering/Core/vtkTextMapper.cxx b/Rendering/Core/vtkTextMapper.cxx
index ff358355fd205bd4eb77f7bea25d7ef9b79e7a8a..a16ce004d31932d84a56c788b067d51ebc5479d1 100644
--- a/Rendering/Core/vtkTextMapper.cxx
+++ b/Rendering/Core/vtkTextMapper.cxx
@@ -441,21 +441,17 @@ void vtkTextMapper::UpdateQuad(vtkActor2D *actor, int dpi)
     int dims[3];
     this->Image->GetDimensions(dims);
 
-    // Add a fudge factor to the texture coordinates to prevent the top
-    // row of pixels from being truncated on some systems. The coordinates
-    // are calculated to be centered on a texel and trim the padding from the
-    // image. (padding is often added to create textures that have power-of-two
-    // dimensions)
+    // The coordinates are calculated to be centered on a texel and
+    // trim the padding from the image. (padding is often added to
+    // create textures that have power-of-two dimensions)
     float tw = static_cast<float>(this->TextDims[0]);
     float th = static_cast<float>(this->TextDims[1]);
     float iw = static_cast<float>(dims[0]);
     float ih = static_cast<float>(dims[1]);
-    float tcXMin = 1.f / (2.f * iw);
-    float tcYMin = 1.f / (2.f * ih);
-    float tcXMax = std::min(1.0f,
-                            (((2.f * tw - 1.f) / (2.f)) + 0.000001f) / iw);
-    float tcYMax = std::min(1.0f,
-                            (((2.f * th - 1.f) / (2.f)) + 0.000001f) / ih);
+    float tcXMin = 0;
+    float tcYMin = 0;
+    float tcXMax = static_cast<float>(tw) / iw;
+    float tcYMax = static_cast<float>(th) / ih;
     if (vtkFloatArray *tc =
         vtkArrayDownCast<vtkFloatArray>(
           this->PolyData->GetPointData()->GetTCoords()))
@@ -505,17 +501,19 @@ void vtkTextMapper::UpdateQuad(vtkActor2D *actor, int dpi)
       text_bbox[0] = 0;
       text_bbox[2] = 0;
       }
-
+    // adjust the quad so that the anchor point and a point with the same
+    // coordinates fall on the same pixel.
+    double shiftPixel = 1;
     double x = static_cast<double>(text_bbox[0]);
     double y = static_cast<double>(text_bbox[2]);
     double w = static_cast<double>(this->TextDims[0]);
     double h = static_cast<double>(this->TextDims[1]);
 
     this->Points->Reset();
-    this->Points->InsertNextPoint(x, y, 0.);
-    this->Points->InsertNextPoint(x, y + h, 0.);
-    this->Points->InsertNextPoint(x + w, y + h, 0.);
-    this->Points->InsertNextPoint(x + w, y, 0.);
+    this->Points->InsertNextPoint(x - shiftPixel, y - shiftPixel, 0.);
+    this->Points->InsertNextPoint(x - shiftPixel, y + h - shiftPixel, 0.);
+    this->Points->InsertNextPoint(x + w - shiftPixel, y + h - shiftPixel, 0.);
+    this->Points->InsertNextPoint(x + w - shiftPixel, y - shiftPixel, 0.);
     this->CoordsTime.Modified();
     }
 }
diff --git a/Rendering/Core/vtkTextProperty.cxx b/Rendering/Core/vtkTextProperty.cxx
index 3fe7484fcdeb3cfe54acd8492f9d87511dbd4542..b904c4ecea7a5ef901da8719a91ad7e87f5ec0c9 100644
--- a/Rendering/Core/vtkTextProperty.cxx
+++ b/Rendering/Core/vtkTextProperty.cxx
@@ -51,6 +51,7 @@ vtkTextProperty::vtkTextProperty()
 
   this->Justification = VTK_TEXT_LEFT;
   this->VerticalJustification = VTK_TEXT_BOTTOM;
+  this->UseTightBoundingBox = 0;
 
   this->LineOffset = 0.0;
   this->LineSpacing = 1.1; // why not 1.0 ?
diff --git a/Rendering/Core/vtkTextProperty.h b/Rendering/Core/vtkTextProperty.h
index 445e6e9b0df3a825d93450b24c48bb933f3d9a9b..4ba0c29e1fba2b57fa7952a397bdeb29b9cbc307 100644
--- a/Rendering/Core/vtkTextProperty.h
+++ b/Rendering/Core/vtkTextProperty.h
@@ -159,6 +159,15 @@ public:
     {this->SetVerticalJustification(VTK_TEXT_TOP);};
   const char *GetVerticalJustificationAsString();
 
+  // Description:
+  // If this property is on, text is alligned to drawn pixels not to font metrix.
+  // If the text does not include descents, the bounding box will not extend below
+  // the baseline. This option can be used to get centered labels. It does not
+  // work well if the string changes as the string position will move around.
+  vtkSetMacro(UseTightBoundingBox, int);
+  vtkGetMacro(UseTightBoundingBox, int);
+  vtkBooleanMacro(UseTightBoundingBox, int);
+
   // Description:
   // Set/Get the text's orientation (in degrees).
   vtkSetMacro(Orientation,double);
@@ -199,6 +208,7 @@ protected:
   int   ShadowOffset[2];
   int   Justification;
   int   VerticalJustification;
+  int   UseTightBoundingBox;
   double Orientation;
   double LineOffset;
   double LineSpacing;
diff --git a/Rendering/FreeType/Testing/Data/Baseline/OverlayTextOnImage.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/OverlayTextOnImage.png.md5
index 429361a845919f0e17b133691c8c61fb788b9eec..514c7f5adf265cfbb70629c6de0c54d76f549a18 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/OverlayTextOnImage.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/OverlayTextOnImage.png.md5
@@ -1 +1 @@
-18a9e3586c80a0e2f6550ee17d562482
+b2af90b304452dae5562c3158e1a6562
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestFTStringToPath.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestFTStringToPath.png.md5
index 3345551593409058753b59db6a4c8168bd521707..a68b092d29681987080f0c574f1a3a91eccb6b2c 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestFTStringToPath.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestFTStringToPath.png.md5
@@ -1 +1 @@
-03d6ba4175b83a363ddc20a82507f7e0
+26c9424305e0d17256aa3fb033f750a6
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestFreeTypeTextMapperNoMath.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestFreeTypeTextMapperNoMath.png.md5
index 97acdf8b8107a8f86f5e3c06dda2c58077cd099b..b36041c00f4e7e36f51a8a6c1b9c99780d2957b5 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestFreeTypeTextMapperNoMath.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestFreeTypeTextMapperNoMath.png.md5
@@ -1 +1 @@
-9674f2662980d405810aa6c9cab225a3
+f4e5969bf79e65a1527d54461b8387f5
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestMathTextFreeTypeTextRendererNoMath.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestMathTextFreeTypeTextRendererNoMath.png.md5
index bad067fee87fa7299f85fbbd7c0119f7a5c6fd8b..f3cce0758da680a019c6577ec1df3a18168681fc 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestMathTextFreeTypeTextRendererNoMath.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestMathTextFreeTypeTextRendererNoMath.png.md5
@@ -1 +1 @@
-6f9c7264b8fcade67f0490e1aae70f4a
+493b875c80cfb0021de745fba33e9683
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor.png.md5
index 25609730fa9dff7077fdd475f70cb1c2f38f2083..de2be5e99eab5c9fad43eacc834e85e86c861080 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor.png.md5
@@ -1 +1 @@
-54a89fbcb678382b1a5401f95e69d85d
+f2b830630e529cf13b3757860c3b497d
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3D.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3D.png.md5
index 9d24b582971d647a53addd52bd7905a0d35b42d0..120128a3a936dd1de1dd4f7bb9e4fdb39e172ec7 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3D.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3D.png.md5
@@ -1 +1 @@
-8d07293245771ce47e686dba6cca988a
+c7ec56bfdc5b2a933f4d8736c8ee4d75
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending.png.md5
index bb340c5de511f4acf427a71a849f3b6eff02e89d..cbb0aa0c0df7a8ac6af2f7ce3a26c55356981481 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending.png.md5
@@ -1 +1 @@
-11eca48cb9fa72e70efb5d82935461e9
+f53b352dd7a53b9d09dd402db0677587
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending_1.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending_1.png.md5
index ea6168909ab0cabd933ad62f6deaa64ae1f47c1e..da5e5cc528f0d7f2e9e72463435f9ed807e19d4c 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending_1.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending_1.png.md5
@@ -1 +1 @@
-ae507c9ce3e05622d770be71c7916c51
+c3bfebcefb1ae180095c208f500cdd3c
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DDepthPeeling.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DDepthPeeling.png.md5
index bb340c5de511f4acf427a71a849f3b6eff02e89d..7b5be2d7d092589ca969f0f1894f291254231782 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DDepthPeeling.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DDepthPeeling.png.md5
@@ -1 +1 @@
-11eca48cb9fa72e70efb5d82935461e9
+1c60055ea7ec1c93b93cfec4eda48d6c
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextActorScaleModeProp.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestTextActorScaleModeProp.png.md5
index 3727791f9a3157ad2a36d529002e4d08052d3070..1364e3130f7996b2428f442137543463dbc1d847 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestTextActorScaleModeProp.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextActorScaleModeProp.png.md5
@@ -1 +1 @@
-066680ecb5d718d8cc6dea2c63d3c35b
+37340a38a79c49858a6093aea07116b7
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextActorScaleModeProp_1.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestTextActorScaleModeProp_1.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..e043500b60f51b9f0ae8c1f35d87b5d1104ce9d5
--- /dev/null
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextActorScaleModeProp_1.png.md5
@@ -0,0 +1 @@
+a33a9895b88b645817d821a72c3d7f07
diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextMapper.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/TestTextMapper.png.md5
index 618e2564520db717de47684465e67af14e9136e5..a5aa75418ccc320d65c4e468d0dbc25a6ae142de 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/TestTextMapper.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextMapper.png.md5
@@ -1 +1 @@
-e1548cb8e4aea08d12da80f284952732
+f8f7c0a10ade880d11d9b8ea0aced14c
diff --git a/Rendering/FreeType/Testing/Data/Baseline/multiLineText.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/multiLineText.png.md5
index 97dc5728bb5d0fd56b99015e522383641b3cc1b4..b2765a2954606652ad899c5d1fba40f13c54147a 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/multiLineText.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/multiLineText.png.md5
@@ -1 +1 @@
-b3f73adf1e94abb074a7c574c448b6c7
+81c55a10679e29abe64124bc019642e8
diff --git a/Rendering/FreeType/Testing/Data/Baseline/multiLineText_1.png.md5 b/Rendering/FreeType/Testing/Data/Baseline/multiLineText_1.png.md5
index fbc3525235c83cb6ffcafb8fedbe331d05f4596f..0a9bced4ab6180ed057d0101b659ef50dde294f9 100644
--- a/Rendering/FreeType/Testing/Data/Baseline/multiLineText_1.png.md5
+++ b/Rendering/FreeType/Testing/Data/Baseline/multiLineText_1.png.md5
@@ -1 +1 @@
-922940df8b7b78bfad8316b9590ef2f3
+63c4f3d5bb1dcfcd0592fa7522316f66
diff --git a/Rendering/FreeType/Testing/Python/multiLineText.py b/Rendering/FreeType/Testing/Python/multiLineText.py
index 512c48d4105ddb3728cb38809a5adda6eea681aa..fce0b95aa9918eedccd4a2d0f4cb2629a0c45798 100755
--- a/Rendering/FreeType/Testing/Python/multiLineText.py
+++ b/Rendering/FreeType/Testing/Python/multiLineText.py
@@ -50,7 +50,7 @@ singleLineTextActorC = vtk.vtkActor2D()
 singleLineTextActorC.SetMapper(singleLineTextC)
 singleLineTextActorC.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
 singleLineTextActorC.GetPositionCoordinate().SetValue(0.05,0.75)
-# The text is on a single line and top-justified.
+# The text is on a single line and top-justified - above 0.5
 singleLineTextT = vtk.vtkTextMapper()
 singleLineTextT.SetInput("Single line (top)")
 tprop = singleLineTextT.GetTextProperty()
@@ -61,7 +61,83 @@ singleLineTextActorT = vtk.vtkActor2D()
 singleLineTextActorT.SetMapper(singleLineTextT)
 singleLineTextActorT.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
 singleLineTextActorT.GetPositionCoordinate().SetValue(0.05,0.65)
-# The text is on multiple lines and left- and top-justified.
+# The text is on a single line and top-justified -below 0.5
+singleLineTextTB = vtk.vtkTextMapper()
+singleLineTextTB.SetInput("Single line below (top)")
+tprop = singleLineTextTB.GetTextProperty()
+tprop.ShallowCopy(singleLineTextProp)
+tprop.SetVerticalJustificationToTop()
+tprop.SetColor(0,0,1)
+singleLineTextActorTB = vtk.vtkActor2D()
+singleLineTextActorTB.SetMapper(singleLineTextTB)
+singleLineTextActorTB.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
+singleLineTextActorTB.GetPositionCoordinate().SetValue(0.5,0.25)
+# The text is on a single line and centered -below 0.5
+singleLineTextCC = vtk.vtkTextMapper()
+singleLineTextCC.SetInput("HHHHH")
+tprop = singleLineTextCC.GetTextProperty()
+tprop.ShallowCopy(singleLineTextProp)
+tprop.SetJustificationToCentered()
+tprop.SetVerticalJustificationToCentered()
+tprop.UseTightBoundingBoxOn()
+tprop.SetColor(0,0,0)
+singleLineTextActorCC = vtk.vtkActor2D()
+singleLineTextActorCC.SetMapper(singleLineTextCC)
+singleLineTextActorCC.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
+singleLineTextActorCC.GetPositionCoordinate().SetValue(0.5,0.15)
+# The text is on a single line and bottom-right justified with a tight bounding-box
+singleLineTextBR = vtk.vtkTextMapper()
+singleLineTextBR.SetInput("Line bottom")
+tprop = singleLineTextBR.GetTextProperty()
+tprop.ShallowCopy(singleLineTextProp)
+tprop.SetJustificationToRight()
+tprop.SetVerticalJustificationToBottom()
+tprop.UseTightBoundingBoxOn()
+tprop.SetColor(0,0,1)
+singleLineTextActorBR = vtk.vtkActor2D()
+singleLineTextActorBR.SetMapper(singleLineTextBR)
+singleLineTextActorBR.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
+singleLineTextActorBR.GetPositionCoordinate().SetValue(0.95,0.15)
+# The text is on a single line and bottom-right justified with a tight bounding-box
+singleLineTextBL = vtk.vtkTextMapper()
+singleLineTextBL.SetInput("Tight line (bottom)")
+tprop = singleLineTextBL.GetTextProperty()
+tprop.ShallowCopy(singleLineTextProp)
+tprop.SetJustificationToLeft()
+tprop.SetVerticalJustificationToBottom()
+tprop.UseTightBoundingBoxOn()
+tprop.SetColor(0,0,1)
+singleLineTextActorBL = vtk.vtkActor2D()
+singleLineTextActorBL.SetMapper(singleLineTextBL)
+singleLineTextActorBL.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
+singleLineTextActorBL.GetPositionCoordinate().SetValue(0.05,0.15)
+# The text is on a single line and top-justified - above 0.5
+singleLineTextLTT = vtk.vtkTextMapper()
+singleLineTextLTT.SetInput("Single line (top)")
+tprop = singleLineTextLTT.GetTextProperty()
+tprop.ShallowCopy(singleLineTextProp)
+tprop.SetVerticalJustificationToTop()
+tprop.UseTightBoundingBoxOn()
+tprop.SetColor(0,0,1)
+singleLineTextActorLTT = vtk.vtkActor2D()
+singleLineTextActorLTT.SetMapper(singleLineTextLTT)
+singleLineTextActorLTT.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
+singleLineTextActorLTT.GetPositionCoordinate().SetValue(0.05,0.15)
+# The text is on a single line and top-justified - above 0.5
+singleLineTextRTT = vtk.vtkTextMapper()
+singleLineTextRTT.SetInput("nge ne op")
+tprop = singleLineTextRTT.GetTextProperty()
+tprop.ShallowCopy(singleLineTextProp)
+tprop.SetJustificationToRight()
+tprop.SetVerticalJustificationToTop()
+tprop.UseTightBoundingBoxOn()
+tprop.SetColor(0,0,1)
+singleLineTextActorRTT = vtk.vtkActor2D()
+singleLineTextActorRTT.SetMapper(singleLineTextRTT)
+singleLineTextActorRTT.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
+singleLineTextActorRTT.GetPositionCoordinate().SetValue(0.95,0.15)
+
+# The text is on multiple lines and left- and top-justified - below 0.5
 textMapperL = vtk.vtkTextMapper()
 textMapperL.SetInput("This is\nmulti-line\ntext output\n(left-top)")
 tprop = textMapperL.GetTextProperty()
@@ -73,6 +149,18 @@ textActorL = vtk.vtkActor2D()
 textActorL.SetMapper(textMapperL)
 textActorL.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
 textActorL.GetPositionCoordinate().SetValue(0.05,0.5)
+# The text is on multiple lines and left- and top-justified - above 0.5
+textMapperLA = vtk.vtkTextMapper()
+textMapperLA.SetInput("This is\nmulti-line\ntext output\nabove (left-top)")
+tprop = textMapperLA.GetTextProperty()
+tprop.ShallowCopy(multiLineTextProp)
+tprop.SetJustificationToLeft()
+tprop.SetVerticalJustificationToTop()
+tprop.SetColor(1,0,0)
+textActorLA = vtk.vtkActor2D()
+textActorLA.SetMapper(textMapperLA)
+textActorLA.GetPositionCoordinate().SetCoordinateSystemToNormalizedDisplay()
+textActorLA.GetPositionCoordinate().SetValue(0.5,0.85)
 # The text is on multiple lines and center-justified (both horizontal and
 # vertical).
 textMapperC = vtk.vtkTextMapper()
@@ -110,11 +198,16 @@ Pts.InsertNextPoint(0.95,1.0,0.0)
 Pts.InsertNextPoint(0.0,0.5,0.0)
 Pts.InsertNextPoint(1.0,0.5,0.0)
 Pts.InsertNextPoint(0.00,0.85,0.0)
-Pts.InsertNextPoint(0.50,0.85,0.0)
+Pts.InsertNextPoint(1.00,0.85,0.0)
 Pts.InsertNextPoint(0.00,0.75,0.0)
 Pts.InsertNextPoint(0.50,0.75,0.0)
 Pts.InsertNextPoint(0.00,0.65,0.0)
 Pts.InsertNextPoint(0.50,0.65,0.0)
+Pts.InsertNextPoint(0.00,0.25,0.0)
+Pts.InsertNextPoint(1.00,0.25,0.0)
+Pts.InsertNextPoint(0.00,0.15,0.0)
+Pts.InsertNextPoint(1.00,0.15,0.0)
+
 # Set up the lines that use these points.
 Lines = vtk.vtkCellArray()
 Lines.InsertNextCell(2)
@@ -138,13 +231,21 @@ Lines.InsertCellPoint(11)
 Lines.InsertNextCell(2)
 Lines.InsertCellPoint(12)
 Lines.InsertCellPoint(13)
+Lines.InsertNextCell(2)
+Lines.InsertCellPoint(14)
+Lines.InsertCellPoint(15)
+Lines.InsertNextCell(2)
+Lines.InsertCellPoint(16)
+Lines.InsertCellPoint(17)
+
+
 # Create a grid that uses these points and lines.
 Grid = vtk.vtkPolyData()
 Grid.SetPoints(Pts)
 Grid.SetLines(Lines)
 # Set up the coordinate system.
 normCoords = vtk.vtkCoordinate()
-normCoords.SetCoordinateSystemToNormalizedViewport()
+normCoords.SetCoordinateSystemToNormalizedDisplay()
 # Set up the mapper and actor (2D) for the grid.
 mapper = vtk.vtkPolyDataMapper2D()
 mapper.SetInputData(Grid)
@@ -165,11 +266,18 @@ iren.SetRenderWindow(renWin)
 #
 ren1.AddActor2D(gridActor)
 ren1.AddActor2D(textActorL)
+ren1.AddActor2D(singleLineTextActorT)
+ren1.AddActor2D(textActorLA)
 ren1.AddActor2D(textActorC)
 ren1.AddActor2D(textActorR)
 ren1.AddActor2D(singleLineTextActorB)
 ren1.AddActor2D(singleLineTextActorC)
-ren1.AddActor2D(singleLineTextActorT)
+ren1.AddActor2D(singleLineTextActorLTT)
+ren1.AddActor2D(singleLineTextActorRTT)
+ren1.AddActor2D(singleLineTextActorTB)
+ren1.AddActor2D(singleLineTextActorBR)
+ren1.AddActor2D(singleLineTextActorBL)
+ren1.AddActor2D(singleLineTextActorCC)
 ren1.SetBackground(1,1,1)
 renWin.SetSize(500,300)
 ren1.GetActiveCamera().Zoom(1.5)
diff --git a/Rendering/FreeType/Testing/Tcl/multiLineText.tcl b/Rendering/FreeType/Testing/Tcl/multiLineText.tcl
index 4d219e5f4c0547c1b31ac365a0d5ce96245bfb85..95551a6f4e00c147d0e318cfad1bb055329b0161 100644
--- a/Rendering/FreeType/Testing/Tcl/multiLineText.tcl
+++ b/Rendering/FreeType/Testing/Tcl/multiLineText.tcl
@@ -58,7 +58,7 @@ vtkActor2D singleLineTextActorC
           SetCoordinateSystemToNormalizedDisplay
     [singleLineTextActorC GetPositionCoordinate] SetValue 0.05 0.75
 
-# The text is on a single line and top-justified.
+# The text is on a single line and top-justified - above 0.5
 vtkTextMapper singleLineTextT
     singleLineTextT SetInput "Single line (top)"
     set tprop [singleLineTextT GetTextProperty]
@@ -71,7 +71,89 @@ vtkActor2D singleLineTextActorT
           SetCoordinateSystemToNormalizedDisplay
     [singleLineTextActorT GetPositionCoordinate] SetValue 0.05 0.65
 
-# The text is on multiple lines and left- and top-justified.
+# The text is on a single line and top-justified -below 0.5
+vtkTextMapper singleLineTextTB
+    singleLineTextTB SetInput "Single line below (top)"
+    set tprop [singleLineTextTB GetTextProperty]
+    $tprop ShallowCopy singleLineTextProp
+    $tprop SetVerticalJustificationToTop
+    $tprop SetColor 0 0 1
+vtkActor2D singleLineTextActorTB
+    singleLineTextActorTB SetMapper singleLineTextTB
+    [singleLineTextActorTB GetPositionCoordinate] \
+        SetCoordinateSystemToNormalizedDisplay
+    [singleLineTextActorTB GetPositionCoordinate] SetValue 0.5 0.25
+
+# The text is on a single line and centered -below 0.5
+vtkTextMapper singleLineTextCC
+    singleLineTextCC SetInput "HHHHH"
+    set tprop [singleLineTextCC GetTextProperty]
+    $tprop ShallowCopy singleLineTextProp
+    $tprop SetJustificationToCentered
+    $tprop SetVerticalJustificationToCentered
+    $tprop UseTightBoundingBoxOn
+    $tprop SetColor 0 0 0
+vtkActor2D singleLineTextActorCC
+    singleLineTextActorCC SetMapper singleLineTextCC
+    [singleLineTextActorCC GetPositionCoordinate] SetCoordinateSystemToNormalizedDisplay
+    [singleLineTextActorCC GetPositionCoordinate] SetValue 0.5 0.15
+
+# The text is on a single line and bottom-right justified with a tight bounding-box
+vtkTextMapper singleLineTextBR
+    singleLineTextBR SetInput "Line bottom"
+    set tprop [singleLineTextBR GetTextProperty]
+    $tprop ShallowCopy singleLineTextProp
+    $tprop SetJustificationToRight
+    $tprop SetVerticalJustificationToBottom
+    $tprop UseTightBoundingBoxOn
+    $tprop SetColor 0 0 1
+vtkActor2D singleLineTextActorBR
+    singleLineTextActorBR SetMapper singleLineTextBR
+    [singleLineTextActorBR GetPositionCoordinate] SetCoordinateSystemToNormalizedDisplay
+    [singleLineTextActorBR GetPositionCoordinate] SetValue 0.95 0.15
+
+# The text is on a single line and bottom-right justified with a tight bounding-box
+vtkTextMapper singleLineTextBL
+    singleLineTextBL SetInput "Tight line (bottom)"
+    set tprop [singleLineTextBL GetTextProperty]
+    $tprop ShallowCopy singleLineTextProp
+    $tprop SetJustificationToLeft
+    $tprop SetVerticalJustificationToBottom
+    $tprop UseTightBoundingBoxOn
+    $tprop SetColor 0 0 1
+vtkActor2D singleLineTextActorBL
+    singleLineTextActorBL SetMapper singleLineTextBL
+    [singleLineTextActorBL GetPositionCoordinate] SetCoordinateSystemToNormalizedDisplay
+    [singleLineTextActorBL GetPositionCoordinate] SetValue 0.05 0.15
+
+# The text is on a single line and top-justified - above 0.5
+vtkTextMapper singleLineTextLTT
+    singleLineTextLTT SetInput "Single line (top)"
+    set tprop [singleLineTextLTT GetTextProperty]
+    $tprop ShallowCopy singleLineTextProp
+    $tprop SetVerticalJustificationToTop
+    $tprop UseTightBoundingBoxOn
+    $tprop SetColor 0 0 1
+vtkActor2D singleLineTextActorLTT
+    singleLineTextActorLTT SetMapper singleLineTextLTT
+    [singleLineTextActorLTT GetPositionCoordinate] SetCoordinateSystemToNormalizedDisplay
+    [singleLineTextActorLTT GetPositionCoordinate] SetValue 0.05 0.15
+
+# The text is on a single line and top-justified - above 0.5
+vtkTextMapper singleLineTextRTT
+    singleLineTextRTT SetInput "nge ne op"
+    set tprop [singleLineTextRTT GetTextProperty]
+    $tprop ShallowCopy singleLineTextProp
+    $tprop SetJustificationToRight
+    $tprop SetVerticalJustificationToTop
+    $tprop UseTightBoundingBoxOn
+    $tprop SetColor 0 0 1
+vtkActor2D singleLineTextActorRTT
+    singleLineTextActorRTT SetMapper singleLineTextRTT
+    [singleLineTextActorRTT GetPositionCoordinate] SetCoordinateSystemToNormalizedDisplay
+    [singleLineTextActorRTT GetPositionCoordinate] SetValue 0.95 0.15
+
+# The text is on multiple lines and left- and top-justified - below 0.5
 vtkTextMapper textMapperL
     textMapperL SetInput "This is\nmulti-line\ntext output\n(left-top)"
     set tprop [textMapperL GetTextProperty]
@@ -84,6 +166,19 @@ vtkActor2D textActorL
     [textActorL GetPositionCoordinate] SetCoordinateSystemToNormalizedDisplay
     [textActorL GetPositionCoordinate] SetValue 0.05 0.5
 
+# The text is on multiple lines and left- and top-justified - above 0.5
+vtkTextMapper textMapperLA
+    textMapperLA SetInput "This is\nmulti-line\ntext output\nabove (left-top)"
+    set tprop [textMapperLA GetTextProperty]
+    $tprop ShallowCopy multiLineTextProp
+    $tprop SetJustificationToLeft
+    $tprop SetVerticalJustificationToTop
+    $tprop SetColor 1 0 0
+vtkActor2D textActorLA
+    textActorLA SetMapper textMapperLA
+    [textActorLA GetPositionCoordinate] SetCoordinateSystemToNormalizedDisplay
+    [textActorLA GetPositionCoordinate] SetValue 0.5 0.85
+
 # The text is on multiple lines and center-justified (both horizontal and
 # vertical).
 vtkTextMapper textMapperC
@@ -123,12 +218,17 @@ vtkPoints Pts
     Pts InsertNextPoint 0.95 1.0 0.0
     Pts InsertNextPoint 0.0 0.5 0.0
     Pts InsertNextPoint 1.0 0.5 0.0
-    Pts InsertNextPoint 0.00 0.85 0.0
-    Pts InsertNextPoint 0.50 0.85 0.0
+    Pts InsertNextPoint 0.0 0.85 0.0
+    Pts InsertNextPoint 1.0 0.85 0.0
     Pts InsertNextPoint 0.00 0.75 0.0
     Pts InsertNextPoint 0.50 0.75 0.0
     Pts InsertNextPoint 0.00 0.65 0.0
     Pts InsertNextPoint 0.50 0.65 0.0
+    Pts InsertNextPoint 0.00 0.25 0.0
+    Pts InsertNextPoint 1.00 0.25 0.0
+    Pts InsertNextPoint 0.00 0.15 0.0
+    Pts InsertNextPoint 1.00 0.15 0.0
+
 # Set up the lines that use these points.
 vtkCellArray Lines
     Lines InsertNextCell 2
@@ -152,13 +252,20 @@ vtkCellArray Lines
     Lines InsertNextCell 2
     Lines InsertCellPoint 12
     Lines InsertCellPoint 13
+    Lines InsertNextCell 2
+    Lines InsertCellPoint 14
+    Lines InsertCellPoint 15
+    Lines InsertNextCell 2
+    Lines InsertCellPoint 16
+    Lines InsertCellPoint 17
+
 # Create a grid that uses these points and lines.
 vtkPolyData Grid
     Grid SetPoints Pts
     Grid SetLines Lines
 # Set up the coordinate system.
 vtkCoordinate normCoords
-    normCoords SetCoordinateSystemToNormalizedViewport
+    normCoords SetCoordinateSystemToNormalizedDisplay
 
 # Set up the mapper and actor (2D) for the grid.
 vtkPolyDataMapper2D mapper
@@ -182,11 +289,18 @@ vtkRenderWindowInteractor iren
 #
 ren1 AddActor2D gridActor
 ren1 AddActor2D textActorL
+ren1 AddActor2D singleLineTextActorT
+ren1 AddActor2D textActorLA
 ren1 AddActor2D textActorC
 ren1 AddActor2D textActorR
 ren1 AddActor2D singleLineTextActorB
 ren1 AddActor2D singleLineTextActorC
-ren1 AddActor2D singleLineTextActorT
+ren1 AddActor2D singleLineTextActorLTT
+ren1 AddActor2D singleLineTextActorRTT
+ren1 AddActor2D singleLineTextActorTB
+ren1 AddActor2D singleLineTextActorBR
+ren1 AddActor2D singleLineTextActorBL
+ren1 AddActor2D singleLineTextActorCC
 
 ren1 SetBackground 1 1 1
 renWin SetSize 500 300
diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx
index 0f67e024a5251eb20d37707a7ec938a25413c962..5e944d3944972840391fcb4e396f469314599693 100644
--- a/Rendering/FreeType/vtkFreeTypeTools.cxx
+++ b/Rendering/FreeType/vtkFreeTypeTools.cxx
@@ -40,6 +40,8 @@
 #include <algorithm>
 #include <map>
 #include <vector>
+#include <sstream>
+#include <limits>
 
 // Print debug info
 #define VTK_FTFC_DEBUG 0
@@ -78,8 +80,10 @@ public:
   FT_Matrix inverseRotation;
 
   // Set by CalculateBoundingBox
-  int ascent;
-  int descent;
+  int ascent;    // position of the highest point of character from baseline which
+                 // has position 0. Negative if below baseline.
+  int descent;   // position of the the lowest point of character from baseline which
+                 // has position 0. Negative if below baseline
   int height;
   struct LineMetrics {
     vtkVector2i origin;
@@ -1340,7 +1344,7 @@ bool vtkFreeTypeTools::RenderStringInternal(vtkTextProperty *tprop,
     return false;
     }
 
-  // Draw a yellow dot at the anchor point:
+  // Draw a red dot at the anchor point:
   if (this->DebugTextures)
     {
     unsigned char *ptr =
@@ -1348,7 +1352,7 @@ bool vtkFreeTypeTools::RenderStringInternal(vtkTextProperty *tprop,
     if (ptr)
       {
       ptr[0] = 255;
-      ptr[1] = 255;
+      ptr[1] = 0;
       ptr[2] = 0;
       ptr[3] = 255;
       }
@@ -1389,10 +1393,27 @@ bool vtkFreeTypeTools::StringToPathInternal(vtkTextProperty *tprop,
   return true;
 }
 
+namespace
+{
+const char* DEFAULT_HEIGHT_STRING = "_/7Agfy";
+}
+
+//----------------------------------------------------------------------------
+bool vtkFreeTypeTools::CalculateBoundingBox(const vtkUnicodeString& str, MetaData &metaData)
+{
+  return CalculateBoundingBox(str, metaData, vtkUnicodeString::from_utf8(DEFAULT_HEIGHT_STRING));
+}
+
+//----------------------------------------------------------------------------
+bool vtkFreeTypeTools::CalculateBoundingBox(const vtkStdString& str, MetaData &metaData)
+{
+  return CalculateBoundingBox(str, metaData, vtkStdString(DEFAULT_HEIGHT_STRING));
+}
+
 //----------------------------------------------------------------------------
 template <typename T>
 bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
-                                            MetaData &metaData)
+                                            MetaData &metaData, const T& defaultHeightString)
 {
   // Calculate the metrics for each line. These will be used to calculate
   // a bounding box, but first we need to know the maximum line length to
@@ -1423,36 +1444,47 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
   metaData.maxLineWidth = std::max(metaData.maxLineWidth,
                                    metaData.lineMetrics.back().width);
 
-  // Calculate line height from a reference set of characters, since the global
-  // face values are usually way too big. This is the same string used to
-  // determine height in vtkFreeTypeUtilities.
-  const char *heightString = "_/7Agfy";
-  metaData.ascent = 0;
-  metaData.descent = 0;
-  while (*heightString)
+  int numLines = metaData.lineMetrics.size();
+  T heightString;
+  if (metaData.textProperty->GetUseTightBoundingBox() && numLines == 1)
+    {
+    // Calculate line hight from actual characters. This works only for single line text
+    // and may result in a hight that does not include descent. It is used to get
+    // a centered label.
+    heightString = str;
+    }
+  else
+    {
+    // Calculate line height from a reference set of characters, since the global
+    // face values are usually way too big.
+    heightString = defaultHeightString;
+    }
+  metaData.ascent = std::numeric_limits<int>::min();
+  metaData.descent = std::numeric_limits<int>::max();
+  typename T::const_iterator it = heightString.begin();
+  while (it != heightString.end())
     {
     FT_BitmapGlyph bitmapGlyph;
     FT_UInt glyphIndex;
     // Use the unrotated face to get correct metrics:
     FT_Bitmap *bitmap = this->GetBitmap(
-          *heightString, &metaData.unrotatedScaler, glyphIndex, bitmapGlyph);
+          *it, &metaData.unrotatedScaler, glyphIndex, bitmapGlyph);
     if (bitmap)
       {
       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
       metaData.descent = std::min(-static_cast<int>((bitmap->rows -
-                                                     (bitmapGlyph->top - 1))),
+                                                     bitmapGlyph->top)),
                                   metaData.descent);
       }
-    ++heightString;
+    ++it;
     }
   // Set line height. Descent is negative.
-  metaData.height = metaData.ascent - metaData.descent;
+  metaData.height = metaData.ascent - metaData.descent + 1;
 
   // The unrotated height of the text
-  int numLines = metaData.lineMetrics.size();
-  double lineSpacing = numLines > 1 ? metaData.textProperty->GetLineSpacing()
-                                    : 1.;
-  int fullHeight = numLines * metaData.height * lineSpacing +
+  int interLineSpacing = (metaData.textProperty->GetLineSpacing() - 1) * metaData.height;
+  int fullHeight = numLines * metaData.height +
+                   (numLines - 1) * interLineSpacing +
                    metaData.textProperty->GetLineOffset();
 
   // Will we be rendering a background?
@@ -1478,8 +1510,12 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
   // The rotated padding on the text's vertical and horizontal axes:
   vtkVector2i hPad(pad, 0);
   vtkVector2i vPad(0, pad);
+  vtkVector2i hOne(1, 0);
+  vtkVector2i vOne(0, 1);
   rotateVector2i(hPad, s, c);
   rotateVector2i(vPad, s, c);
+  rotateVector2i(hOne, s, c);
+  rotateVector2i(vOne, s, c);
 
   // Calculate the bottom left corner of the data rect. Start at anchor point
   // (0, 0) and subtract out justification. Account for background/frame padding to
@@ -1491,7 +1527,7 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
       metaData.BL = metaData.BL - (metaData.dx * 0.5);
       break;
     case VTK_TEXT_RIGHT:
-      metaData.BL = metaData.BL - metaData.dx + hPad;
+      metaData.BL = metaData.BL - metaData.dx + hPad + hOne;
       break;
     case VTK_TEXT_LEFT:
       metaData.BL = metaData.BL - hPad;
@@ -1510,7 +1546,7 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
       metaData.BL = metaData.BL - vPad;
       break;
     case VTK_TEXT_TOP:
-      metaData.BL = metaData.BL - metaData.dy + vPad;
+      metaData.BL = metaData.BL - metaData.dy + vPad + vOne;
       break;
     default:
       vtkErrorMacro(<< "Bad vertical alignment flag: "
@@ -1519,14 +1555,13 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
     }
 
   // Compute the other corners of the data:
-  metaData.TL = metaData.BL + metaData.dy;
-  metaData.TR = metaData.TL + metaData.dx;
-  metaData.BR = metaData.BL + metaData.dx;
+  metaData.TL = metaData.BL + metaData.dy - vOne;
+  metaData.TR = metaData.TL + metaData.dx - hOne;
+  metaData.BR = metaData.BL + metaData.dx - hOne;
 
   // First baseline offset from top-left corner.
   vtkVector2i penOffset(pad, -pad);
   // Account for line spacing to center the text vertically in the bbox:
-  penOffset[1] -= vtkMath::Ceil((lineSpacing - 1.) * metaData.height * 0.5);
   penOffset[1] -= metaData.ascent;
   penOffset[1] -= metaData.textProperty->GetLineOffset();
   rotateVector2i(penOffset, s, c);
@@ -1539,7 +1574,7 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
   textBbox[2] = textBbox[3] = pen[1];
 
   // Calculate line offset:
-  vtkVector2i lineFeed(0, -(metaData.height * lineSpacing));
+  vtkVector2i lineFeed(0, -(metaData.height + interLineSpacing));
   rotateVector2i(lineFeed, s, c);
 
   // Compile the metrics data to determine the final bounding box. Set line
diff --git a/Rendering/FreeType/vtkFreeTypeTools.h b/Rendering/FreeType/vtkFreeTypeTools.h
index 42fac900c0ca8c12c0be49ef81259f7e97e4196a..da217da838980c7622cfd2fb35d99027f23ddcc9 100644
--- a/Rendering/FreeType/vtkFreeTypeTools.h
+++ b/Rendering/FreeType/vtkFreeTypeTools.h
@@ -356,8 +356,10 @@ private:
   // Description:
   // This function initializes calculates the size of the required bounding box
   // and stores it in the MetaData provided.
+  bool CalculateBoundingBox(const vtkStdString& str, MetaData &metaData);
+  bool CalculateBoundingBox(const vtkUnicodeString& str, MetaData &metaData);
   template <typename T>
-  bool CalculateBoundingBox(const T& str, MetaData &metaData);
+  bool CalculateBoundingBox(const T& str, MetaData &metaData, const T& defaultHeightString);
 
   // Description:
   // Internal helper method called by RenderString.
diff --git a/Rendering/Label/Testing/Data/Baseline/TestDynamic2DLabelMapper.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestDynamic2DLabelMapper.png.md5
index 03852bfbf4d9eb7c43d3aae7068bb70e4f721e08..04b4294dbd89c276acabd69bbc8dc42bd27b6a7a 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestDynamic2DLabelMapper.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestDynamic2DLabelMapper.png.md5
@@ -1 +1 @@
-55a100e2f8d461ef6a4411a03de5628e
+a302d56069487f1a4892420e08580c40
diff --git a/Rendering/Label/Testing/Data/Baseline/TestDynamic2DLabelMapper_1.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestDynamic2DLabelMapper_1.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..dbe0a50fa7bbbca29f3ae81995e82de9619678e9
--- /dev/null
+++ b/Rendering/Label/Testing/Data/Baseline/TestDynamic2DLabelMapper_1.png.md5
@@ -0,0 +1 @@
+3a1750e35f5c89ad90066b8029510b18
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper.png.md5
index 76898f8a502dbcbb44f22b742de1bf9eb0283a1c..f6bb0bcc58744c204c65b0f4119f8081b756ccfb 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper.png.md5
@@ -1 +1 @@
-584b25e13933349af2c55c941e1e5ed0
+8dfa81bb255705ad1da392fe5f0c9e56
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D.png.md5
index e2d8d7f733e06227366ca57971ed0343b1b8f13e..7b1e5d837ef708cf773801b15b793c10119f777a 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D.png.md5
@@ -1 +1 @@
-13ade8bb0f7cb7b0476f9612d82e848c
+2a4813c4d6f2e658ed24c2f5a6500ad3
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.md5
index 040eaa51dab9321769c43e231a883279adc0737a..dd0adb91ba5903fe48394980e2f2992a6ee320a1 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.md5
@@ -1 +1 @@
-6d928f9ba3f409d39b417207b2e8aa4a
+136c16379b73e7df61001cb523c5210f
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer.png.md5
index bca3e9a6053da06f41c23402bb4516476b22789e..7d7297b679f338c569241e63d8bb585a77b9d67e 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer.png.md5
@@ -1 +1 @@
-f772e3804b50551463c751df1b7767f3
+e6e3cc9e959aff618a2ef1a85455627c
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D.png.md5
index f0de4930dd98c0743913041d2b75f965357931cc..82773d5ce8b9c8b6e613945d5256acac6be7d6dc 100644
--- a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D.png.md5
@@ -1 +1 @@
-9933986344c7db276c5bbbbefcec29dd
+efbda8b7ad61a767866485f25d9b8f7f
diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_1.png.md5 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_1.png.md5
new file mode 100644
index 0000000000000000000000000000000000000000..de47e3329eec438a23007a5ec6cc7ea642ba0906
--- /dev/null
+++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_1.png.md5
@@ -0,0 +1 @@
+08b0f849da843b527a9a499c6b03edba
diff --git a/Rendering/Label/Testing/Data/Baseline/labeledContours.png.md5 b/Rendering/Label/Testing/Data/Baseline/labeledContours.png.md5
index e845b57204e968751b9c25111ef571c1c93f10db..d74ee8a4d745c1e3b9e70e72688b2404c6d8319a 100644
--- a/Rendering/Label/Testing/Data/Baseline/labeledContours.png.md5
+++ b/Rendering/Label/Testing/Data/Baseline/labeledContours.png.md5
@@ -1 +1 @@
-5010d48b90ce8e879969b0a06336bf40
+6b7c184ef799670d26743ff35a0c335b
diff --git a/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextMapper.png.md5 b/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextMapper.png.md5
index b60c05b6620e3211fd0fcc1086eab7611ea07ad3..6b9228fdcc1d45952aba6dd819f9a30cc4e5bcb0 100644
--- a/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextMapper.png.md5
+++ b/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextMapper.png.md5
@@ -1 +1 @@
-d73d96a5097360470a39798a34040e3d
+fab4f48e182fa322c53683302b30ee94
diff --git a/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextMapperBigger.png.md5 b/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextMapperBigger.png.md5
index c5033afe3780803e53e534d1c8e0034119ead353..2313f0c9f3337cb096f1bf9742b3a77e1960fe38 100644
--- a/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextMapperBigger.png.md5
+++ b/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextMapperBigger.png.md5
@@ -1 +1 @@
-9cc8c4ca0d38eaa9b079f47fa021bc51
+5e195c727d75a0e85ebebd47bf9718bf
diff --git a/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextOverlay.png.md5 b/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextOverlay.png.md5
index d8537f2dbc55e19e1a7a899d1080b3fcf1f66bb4..29cd3e2af1fd13c3ee94c04fd43c73ca0a22689f 100644
--- a/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextOverlay.png.md5
+++ b/Rendering/OpenGL/Testing/Data/Baseline/TestFreetypeTextOverlay.png.md5
@@ -1 +1 @@
-1d93d37f48cdab800995389cad4c80a5
+6eb78368d4364cc9c656e033383eabe3
diff --git a/Views/Infovis/Testing/Data/Baseline/TestCoincidentGraphLayoutView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestCoincidentGraphLayoutView.png.md5
index e0d445681baa18d419e3dc6d9e3a29789a73f062..190ab6758008bad671cc992bb1c3a7f6370d067a 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestCoincidentGraphLayoutView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestCoincidentGraphLayoutView.png.md5
@@ -1 +1 @@
-1e57d319deb1b3542bc78aca68a9e877
+800dbcf4df45cadce18d690baf39aa1e
diff --git a/Views/Infovis/Testing/Data/Baseline/TestConeLayoutStrategy.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestConeLayoutStrategy.png.md5
index 99a065cf6b63c8ded07089c81242614277c38b30..a9cb8b19a4cf2d2e75942aef72d16427c881c4bf 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestConeLayoutStrategy.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestConeLayoutStrategy.png.md5
@@ -1 +1 @@
-dcedd666812674f4fe4829c3ebc4edc3
+d73394b4fd1901cb6b4ad3256d54f6f5
diff --git a/Views/Infovis/Testing/Data/Baseline/TestDendrogramItem.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestDendrogramItem.png.md5
index 6ac84f5f44a54025da32e6eb4c498815e401f030..9be8b15be90ab1abb6b5b706afd6a831fb54ae0a 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestDendrogramItem.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestDendrogramItem.png.md5
@@ -1 +1 @@
-91f16ab9a1f0262d4654e399668b26ff
+bb09d291c68e48ec593cfecaf0bbdfda
diff --git a/Views/Infovis/Testing/Data/Baseline/TestDendrogramItem_1.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestDendrogramItem_1.png.md5
index fb4453d31ccaa15d81387cfc0bd7d2a5aff7fae4..14cc26db3ba6dcb61d380a97f8c2c21c1f8becee 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestDendrogramItem_1.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestDendrogramItem_1.png.md5
@@ -1 +1 @@
-7566224920f311cace36f8741f7a1180
+47e5f7d385b282c53adaa98659c5a7e8
diff --git a/Views/Infovis/Testing/Data/Baseline/TestGraphLayoutView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestGraphLayoutView.png.md5
index aebb60a328529b8b3e44264a57c06dff077a1063..7e22925c2b7f17912100e2a8c0eabdf9ecc1216a 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestGraphLayoutView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestGraphLayoutView.png.md5
@@ -1 +1 @@
-131439b242766b6820e4c8c89bc132dc
+563aca88132d1cf750fa02efb94cca7d
diff --git a/Views/Infovis/Testing/Data/Baseline/TestHierarchicalGraphView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestHierarchicalGraphView.png.md5
index 8a3a720d909062c6a90dda4f4f4b5dc8765f7436..2a6b15aa6d007641b00240414dadfc7ac7f43c89 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestHierarchicalGraphView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestHierarchicalGraphView.png.md5
@@ -1 +1 @@
-d20eb70b491a1aacbcbc70eb5770f15c
+19e577f705a23976ebbf4d4066707fd6
diff --git a/Views/Infovis/Testing/Data/Baseline/TestIcicleView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestIcicleView.png.md5
index 1128d7e5fee5eb73fb9155dafc38f4a2d68dd56d..b3417e2f32b097ad645dd018e44f345adab62a21 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestIcicleView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestIcicleView.png.md5
@@ -1 +1 @@
-759b5df2fb4ef7447ad6b0ac02707be1
+d463be38e458b63f09bc358fcf72e1c9
diff --git a/Views/Infovis/Testing/Data/Baseline/TestNetworkViews.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestNetworkViews.png.md5
index 07a93a6e5324ff6bd97a73f2300e40d074db5c9e..15a228afdaa3429c600be0491e3950fa0fc2f46a 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestNetworkViews.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestNetworkViews.png.md5
@@ -1 +1 @@
-61eedffc56d63c8c50d8387d7ad0c670
+eefda29aedd4165ad4bae400f8905be8
diff --git a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView.png.md5
index 416ab051e6a1226507a1e2bf887cb0ab619f7ce7..6a4092ee997a5d350dd9e7da0b728f1e67bdf5b9 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView.png.md5
@@ -1 +1 @@
-b6388cefac4a46cf1edc1df2d83e996c
+600c6f02a49876dfff49e39c3213a92b
diff --git a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_1.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_1.png.md5
deleted file mode 100644
index 189035044d128bdcae540ff77259732dd4389f6e..0000000000000000000000000000000000000000
--- a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_1.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-eaa7d738a968bb9393252bbba26ea5c6
diff --git a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_2.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_2.png.md5
deleted file mode 100644
index f08b5101eb91f9aec49638f6806b561938a09041..0000000000000000000000000000000000000000
--- a/Views/Infovis/Testing/Data/Baseline/TestParallelCoordinatesView_2.png.md5
+++ /dev/null
@@ -1 +0,0 @@
-24cb4563ff257028f275d6fcbc6a07d3
diff --git a/Views/Infovis/Testing/Data/Baseline/TestSpanTreeLayoutStrategy.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestSpanTreeLayoutStrategy.png.md5
index c393e1d4c2893ce8be3b7d1596ec73f2ff849149..c14c0afff2e18f11745a935a07221196cccf25a5 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestSpanTreeLayoutStrategy.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestSpanTreeLayoutStrategy.png.md5
@@ -1 +1 @@
-33ea58df307218060394798c815773e3
+3a3af31a342f5f36ccb766ae4f4ef46e
diff --git a/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem.png.md5
index d0d9ad7956fe91bbea196f6dc50c415d2ab0f43b..8b31538cce93ee56a9c9839bda502376d91838bb 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem.png.md5
@@ -1 +1 @@
-c033114c7a9af92e6cd4b39dfad9b94d
+4a08a4d04344efda9a56f7d748f97d3f
diff --git a/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem_1.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem_1.png.md5
index b4365948630a35a1229624b367a9ac3b08b26381..f7ac7b732272c47beb1919141632a9f3fe13f4e5 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem_1.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem_1.png.md5
@@ -1 +1 @@
-36a2f198a1a1e3d59c464b2071ae8bbf
+5c73212d7fa3b6808efafeeec4a83f3c
diff --git a/Views/Infovis/Testing/Data/Baseline/TestTreeHeatmapAutoCollapse.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestTreeHeatmapAutoCollapse.png.md5
index 2d087d75f16384d06227bb36bf066a40ac8a1ed3..2dc1945f8ee8e5e2e3ee6ba616a9bc11f49f0a70 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestTreeHeatmapAutoCollapse.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestTreeHeatmapAutoCollapse.png.md5
@@ -1 +1 @@
-b3086a3d02f1de3cf30bbc6f283fca81
+706cfd1d66d1848ea7003b368736c5db
diff --git a/Views/Infovis/Testing/Data/Baseline/TestTreeMapView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestTreeMapView.png.md5
index ac89d43e6c6f3adc90ae49733d5154742d69f90e..6b15cba1d1b98d45fd05238a8420ce7a1233ca61 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestTreeMapView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestTreeMapView.png.md5
@@ -1 +1 @@
-721473c6c00b0ccbced17b2d1ee8210d
+b86a8bf579880471d4fbca52f356fe4f
diff --git a/Views/Infovis/Testing/Data/Baseline/TestTreeRingView.png.md5 b/Views/Infovis/Testing/Data/Baseline/TestTreeRingView.png.md5
index 4c80df4f8a78e25b6f43a5ffb8ae0551bbdf6930..efe7e5df307a07d3c71d9a4d04266b6321adaf1f 100644
--- a/Views/Infovis/Testing/Data/Baseline/TestTreeRingView.png.md5
+++ b/Views/Infovis/Testing/Data/Baseline/TestTreeRingView.png.md5
@@ -1 +1 @@
-3b795e0990b158b4780871bace77761c
+aa1fa6bb61a617a7646ce390854d72ab