diff --git a/datastore_server/dist/etc/datastore_server.conf b/datastore_server/dist/etc/datastore_server.conf
index 65b8ef5079bbf3b6989a8d73d6beda1cbdcefa6b..00571173cefee92aa09d93a7b9e7a27611d2317d 100644
--- a/datastore_server/dist/etc/datastore_server.conf
+++ b/datastore_server/dist/etc/datastore_server.conf
@@ -15,7 +15,7 @@ JAVA_OPTS=${JAVA_OPTS:=-server -d64 -Djavax.net.ssl.trustStore=etc/openBIS.keyst
 #
 # Memory options to the JRE
 #
-JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseG1GC -XX:+CMSClassUnloadingEnabled"
 
 #
 # Maximal number of log files to keep
diff --git a/installation/resource/tarball/run-console.sh b/installation/resource/tarball/run-console.sh
index 3413252a6bfaf4340082c88f4c061ab2107d4880..6201b063865c49094e4834bd6cde19eed4069d25 100755
--- a/installation/resource/tarball/run-console.sh
+++ b/installation/resource/tarball/run-console.sh
@@ -11,10 +11,10 @@ fi
 
 if [[ "$_java" ]]; then
     version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}'| cut -c1-3)
-    if [[ "$version" > "1.6" ]]; then
+    if [[ "$version" > "1.7" ]]; then
         echo Java version $version found.
     else         
-        echo Java version $version found is under the required 1.7.
+        echo Java version $version found is under the required 1.8.
         exit -1
     fi
 fi
diff --git a/installation/resource/tarball/run-ui.sh b/installation/resource/tarball/run-ui.sh
index 6cbee2398375f7e4aeb740457f58081940933e5a..71828d493ed204e9382172ce99e37acd532d97eb 100755
--- a/installation/resource/tarball/run-ui.sh
+++ b/installation/resource/tarball/run-ui.sh
@@ -11,10 +11,10 @@ fi
 
 if [[ "$_java" ]]; then
     version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}'| cut -c1-3)
-    if [[ "$version" > "1.6" ]]; then
+    if [[ "$version" > "1.7" ]]; then
         echo Java version $version found.
     else         
-        echo Java version $version found is under the required 1.7.
+        echo Java version $version found is under the required 1.8.
         exit -1
     fi
 fi
diff --git a/openbis/dist/server/openbis.conf b/openbis/dist/server/openbis.conf
index 65b74bf1c81fc8cd027d8b318694a0bda3d4e7ae..bebf4ed325bedc273eb5e957122008351c413697 100644
--- a/openbis/dist/server/openbis.conf
+++ b/openbis/dist/server/openbis.conf
@@ -15,7 +15,7 @@ JAVA_OPTS=${JAVA_OPTS:=-server -d64}
 #
 # Memory options to the JRE
 #
-JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
+JAVA_MEM_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=256m -XX:+UseG1GC -XX:+CMSClassUnloadingEnabled"
 
 #
 # OpenBIS options
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
index e9db5ffec7b27f4c9a50b517bd300d487a9f0f9b..11bb2c8bf1b5c03f14889e818e305239b76d6509 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
@@ -422,7 +422,7 @@ function SampleFormController(mainController, mode, sample, paginationInfo) {
 				mainController.serverFacade.deleteSamples(samplesToDelete,  "Deleted to trashcan from eln sample form " + _this._sampleFormModel.sample.identifier, 
 															function(response) {
 																if(response.error) {
-																	Util.showError("Deletes failed, other changes where commited: " + response.error.message, callbackOk);
+																	Util.showError("Deletions failed, other changes were committed: " + response.error.message, callbackOk);
 																} else {
 																	Util.showSuccess(message, callbackOk);
 																}