diff --git a/.hgtags b/.hgtags
index 69255a9e542e5464a18e7226731428477ce7987d..f0cb0c6b42baaf7ad375a5001910a218a1033708 100644
--- a/.hgtags
+++ b/.hgtags
@@ -956,5 +956,9 @@ ef90c721a4e59b01ca36f25619010a1afe9ed4d5 jdk8u131-b02
 dab1d597165207e14b6886b1823c1e990bc776a3 jdk8u131-b04
 c965fc1aa840a0903709ad69aa0e2100330ccd84 jdk8u131-b05
 6e4cfbc7534f83902692132efb61683528c04a59 jdk8u131-b06
+5b3cb4fbdbc7bdeb7c78a8703c3084ce068f6691 jdk8u131-b07
+db221c0a423e776bec5c3198d11d3f26827bd786 jdk8u131-b08
+56e71d16083904ceddfdd1d66312582a42781646 jdk8u131-b09
+1da23ae49386608550596502d90a381ee6c1dfaa jdk8u131-b10
 692bc6b674dcab72453de08ee9da0856a7e41c0f jdk8u141-b00
 2d5100bddeb80cf767485b787fc3051311e3d7b9 jdk8u151-b00
diff --git a/src/os/windows/vm/os_windows.cpp b/src/os/windows/vm/os_windows.cpp
index e329c9fd6cd65e8e0d7c24b9885960b4206a33f5..44d89a2885e24b2d850aebed19c57a8f628ba826 100644
--- a/src/os/windows/vm/os_windows.cpp
+++ b/src/os/windows/vm/os_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1747,8 +1747,7 @@ void os::win32::print_windows_version(outputStream* st) {
     if (is_workstation) {
       st->print("10");
     } else {
-      // The server version name of Windows 10 is not known at this time
-      st->print("%d.%d", major_version, minor_version);
+      st->print("Server 2016");
     }
     break;
 
diff --git a/src/share/vm/opto/loopnode.cpp b/src/share/vm/opto/loopnode.cpp
index e653557745473b6dc14410ca0b1f1ffb5e5ff718..8f2f22815177323ec2a18f9df5d57c464a929e70 100644
--- a/src/share/vm/opto/loopnode.cpp
+++ b/src/share/vm/opto/loopnode.cpp
@@ -278,8 +278,16 @@ bool PhaseIdealLoop::is_counted_loop( Node *x, IdealLoopTree *loop ) {
     return false;
 
   // Allow funny placement of Safepoint
-  if (back_control->Opcode() == Op_SafePoint)
+  if (back_control->Opcode() == Op_SafePoint) {
+    if (UseCountedLoopSafepoints) {
+      // Leaving the safepoint on the backedge and creating a
+      // CountedLoop will confuse optimizations. We can't move the
+      // safepoint around because its jvm state wouldn't match a new
+      // location. Give up on that loop.
+      return false;
+    }
     back_control = back_control->in(TypeFunc::Control);
+  }
 
   // Controlling test for loop
   Node *iftrue = back_control;
diff --git a/test/compiler/loopopts/TestCountedLoopSafepointBackedge.java b/test/compiler/loopopts/TestCountedLoopSafepointBackedge.java
new file mode 100644
index 0000000000000000000000000000000000000000..d5709675aa96528bae4a1dec162294094b306778
--- /dev/null
+++ b/test/compiler/loopopts/TestCountedLoopSafepointBackedge.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8161147
+ * @summary Safepoint on backedge breaks UseCountedLoopSafepoints
+ * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:+UseCountedLoopSafepoints TestCountedLoopSafepointBackedge
+ *
+ */
+
+public class TestCountedLoopSafepointBackedge {
+    static void test(int[] arr, int inc) {
+        int i = 0;
+        for (;;) {
+            for (int j = 0; j < 10; j++);
+            arr[i] = i;
+            i++;
+            if (i >= 100) {
+                break;
+            }
+            for (int j = 0; j < 10; j++);
+        }
+    }
+
+    static public void main(String[] args) {
+        int[] arr = new int[100];
+        for (int i = 0; i < 20000; i++) {
+             test(arr, 1);
+        }
+    }
+}