From andrew at openjdk.org Wed Mar 1 16:10:36 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Wed, 1 Mar 2023 16:10:36 GMT Subject: git: openjdk/jdk8u-dev: Added tag jdk8u382-b00 for changeset b51619d2 Message-ID: <929c2d3d-6460-4bfa-b07e-95f62ff42612@openjdk.org> Tagged by: Andrew John Hughes Date: 2023-03-01 16:07:57 +0000 Added tag jdk8u382-b00 for changeset b51619d24e0 Changeset: b51619d2 Author: Alexey Bakhtin Date: 2023-02-17 11:26:58 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/b51619d24e0643aa0afdba87ac20b371dbb594e8 From erikj at openjdk.org Wed Mar 1 17:28:49 2023 From: erikj at openjdk.org (Erik Joelsson) Date: Wed, 1 Mar 2023 17:28:49 GMT Subject: git: openjdk/jdk8u-ri: Added tag jdk8u43-b01 for changeset 91768748 Message-ID: <07a629bb-f119-4fa8-b1d0-4f4be82513f5@openjdk.org> Changeset: 91768748 Author: Erik Joelsson Date: 2023-02-24 16:59:13 +0000 URL: https://git.openjdk.org/jdk8u-ri/commit/91768748dc1b03b3f94878bc5c01abcbe87d3d36 From naoto at openjdk.org Thu Mar 2 00:26:16 2023 From: naoto at openjdk.org (Naoto Sato) Date: Thu, 2 Mar 2023 00:26:16 GMT Subject: git: openjdk/jdk8u-ri: 8301400: Allow additional characters for GB18030-2022 support Message-ID: <257024f9-7dd0-4dfb-bcab-4ed20337134d@openjdk.org> Changeset: a039f39e Author: Naoto Sato Date: 2023-03-02 00:23:11 +0000 URL: https://git.openjdk.org/jdk8u-ri/commit/a039f39ee8486e990a4b4341c9e07fc49d3dac2d 8301400: Allow additional characters for GB18030-2022 support Co-authored-by: Justin Lu Reviewed-by: andrew, lancea, iris, alanb ! jdk/make/data/characterdata/CharacterData00.java.template ! jdk/make/data/unicodedata/UnicodeData.txt ! jdk/src/share/classes/java/lang/Character.java ! jdk/test/java/lang/Character/Scripts.txt + jdk/test/java/lang/Character/TestIsJavaIdentifierMethods.java From naoto at openjdk.org Thu Mar 2 00:31:58 2023 From: naoto at openjdk.org (Naoto Sato) Date: Thu, 2 Mar 2023 00:31:58 GMT Subject: git: openjdk/jdk8u-ri: 8303028: Update system property for Java SE specification maintenance version Message-ID: <45e8d80a-f873-4f3b-bb41-c993fc3f8c56@openjdk.org> Changeset: 9eb797dc Author: Justin Lu Committer: Naoto Sato Date: 2023-03-02 00:30:25 +0000 URL: https://git.openjdk.org/jdk8u-ri/commit/9eb797dc6ac09f250b4e308abd43bffa6529c534 8303028: Update system property for Java SE specification maintenance version Reviewed-by: lancea, iris, naoto, andrew ! jdk/src/share/native/java/lang/System.c From sgehwolf at openjdk.org Fri Mar 3 10:35:12 2023 From: sgehwolf at openjdk.org (Severin Gehwolf) Date: Fri, 3 Mar 2023 10:35:12 GMT Subject: git: openjdk/jdk8u: 8303408: [AIX] Broken jdk8u build after JDK-8266391 Message-ID: <50fe5a3d-d7e8-4abf-93f8-0e7c43cddbe3@openjdk.org> Changeset: 4a837299 Author: Deepa Kumari Committer: Severin Gehwolf Date: 2023-03-03 10:34:21 +0000 URL: https://git.openjdk.org/jdk8u/commit/4a837299c68071be563e376efe6f12852bc130e7 8303408: [AIX] Broken jdk8u build after JDK-8266391 Reviewed-by: phh, sgehwolf = jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java From sgehwolf at openjdk.org Fri Mar 3 17:31:42 2023 From: sgehwolf at openjdk.org (Severin Gehwolf) Date: Fri, 3 Mar 2023 17:31:42 GMT Subject: git: openjdk/jdk8u: 2 new changesets Message-ID: Changeset: 7c0d5b49 Author: Severin Gehwolf Date: 2023-03-03 17:29:32 +0000 URL: https://git.openjdk.org/jdk8u/commit/7c0d5b49c05b5990776584de9b3d9f53b8b55e94 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails Reviewed-by: phh, andrew Backport-of: 45abbeed2f4f2899a3c1595b0cd8e573990a16fa ! jdk/test/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java Changeset: 3b80e877 Author: Severin Gehwolf Date: 2023-03-03 17:31:14 +0000 URL: https://git.openjdk.org/jdk8u/commit/3b80e87798b41453738354aa4be030d420a0562a 8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked Reviewed-by: phh, andrew Backport-of: d6bb846159be7e46fba0c3ca2915617f945e0b42 ! jdk/test/security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java From sgehwolf at openjdk.org Fri Mar 3 17:34:51 2023 From: sgehwolf at openjdk.org (Severin Gehwolf) Date: Fri, 3 Mar 2023 17:34:51 GMT Subject: git: openjdk/jdk8u: 8245654: Add Certigna Root CA Message-ID: Changeset: 5806429f Author: Severin Gehwolf Date: 2023-03-03 17:32:53 +0000 URL: https://git.openjdk.org/jdk8u/commit/5806429f7ac582c400896a7ac61e147e93ddeac8 8245654: Add Certigna Root CA Reviewed-by: phh, andrew Backport-of: c8ee076241cc7d83f423683d97ec37f9e0d6ebaa + jdk/make/data/cacerts/certignaca + jdk/test/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java ! jdk/test/sun/security/lib/cacerts/VerifyCACerts.java From andrew at openjdk.org Fri Mar 3 18:05:51 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Fri, 3 Mar 2023 18:05:51 GMT Subject: git: openjdk/jdk8u-dev: 8303462: Bump update version of OpenJDK: 8u382 Message-ID: <1c1beb86-64b9-4724-a093-7a675f01b35a@openjdk.org> Changeset: 3d1fc4bf Author: Andrew John Hughes Date: 2023-03-03 18:04:02 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/3d1fc4bf31e7b4bc7f3d0627f7aee44fe48d414c 8303462: Bump update version of OpenJDK: 8u382 Reviewed-by: sgehwolf ! .jcheck/conf ! common/autoconf/version-numbers From naoto at openjdk.org Fri Mar 3 23:56:23 2023 From: naoto at openjdk.org (Naoto Sato) Date: Fri, 3 Mar 2023 23:56:23 GMT Subject: git: openjdk/jdk8u-ri: Added tag jdk8u43-b02 for changeset 9eb797dc Message-ID: <559591cc-321d-4737-92d6-25fef13c4419@openjdk.org> Changeset: 9eb797dc Author: Justin Lu Committer: Naoto Sato Date: 2023-03-02 00:30:25 +0000 URL: https://git.openjdk.org/jdk8u-ri/commit/9eb797dc6ac09f250b4e308abd43bffa6529c534 From roland at openjdk.org Mon Mar 6 14:57:11 2023 From: roland at openjdk.org (Roland Westrelin) Date: Mon, 6 Mar 2023 14:57:11 GMT Subject: git: openjdk/jdk8u-dev: 8185736: missing default exception handler in calls to rethrow_Stub Message-ID: Changeset: eb2aee68 Author: Dongbo He Committer: Roland Westrelin Date: 2023-03-06 14:56:38 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/eb2aee68eaff5d4880b52bc8c01967215dd6a741 8185736: missing default exception handler in calls to rethrow_Stub Reviewed-by: roland Backport-of: b97f668af3f55c0d67cdd7a4a191bd81cdc4aa78 ! hotspot/src/share/vm/opto/doCall.cpp ! hotspot/src/share/vm/opto/output.cpp From andrew at openjdk.org Tue Mar 7 18:25:40 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Tue, 7 Mar 2023 18:25:40 GMT Subject: git: openjdk/jdk8u: Added tag jdk8u382-b00 for changeset b51619d2 Message-ID: Tagged by: Andrew John Hughes Date: 2023-03-01 16:07:57 +0000 Added tag jdk8u382-b00 for changeset b51619d24e0 Changeset: b51619d2 Author: Alexey Bakhtin Date: 2023-02-17 11:26:58 +0000 URL: https://git.openjdk.org/jdk8u/commit/b51619d24e0643aa0afdba87ac20b371dbb594e8 From andrew at openjdk.org Tue Mar 7 18:25:45 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Tue, 7 Mar 2023 18:25:45 GMT Subject: git: openjdk/jdk8u: Added tag jdk8u372-b05 for changeset 5806429f Message-ID: <8a4b67c4-1e29-4530-9704-28ac89267f57@openjdk.org> Tagged by: Andrew John Hughes Date: 2023-03-07 01:43:33 +0000 Added tag jdk8u372-b05 for changeset 5806429f7ac Changeset: 5806429f Author: Severin Gehwolf Date: 2023-03-03 17:32:53 +0000 URL: https://git.openjdk.org/jdk8u/commit/5806429f7ac582c400896a7ac61e147e93ddeac8 From andrew at openjdk.org Wed Mar 8 03:00:27 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Wed, 8 Mar 2023 03:00:27 GMT Subject: git: openjdk/jdk8u-dev: 5 new changesets Message-ID: <49897665-5782-4dc2-a292-c336d767cc9f@openjdk.org> Changeset: 4a837299 Author: Deepa Kumari Committer: Severin Gehwolf Date: 2023-03-03 10:34:21 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/4a837299c68071be563e376efe6f12852bc130e7 8303408: [AIX] Broken jdk8u build after JDK-8266391 Reviewed-by: phh, sgehwolf = jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java Changeset: 7c0d5b49 Author: Severin Gehwolf Date: 2023-03-03 17:29:32 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/7c0d5b49c05b5990776584de9b3d9f53b8b55e94 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails Reviewed-by: phh, andrew Backport-of: 45abbeed2f4f2899a3c1595b0cd8e573990a16fa ! jdk/test/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java Changeset: 3b80e877 Author: Severin Gehwolf Date: 2023-03-03 17:31:14 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/3b80e87798b41453738354aa4be030d420a0562a 8248899: security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java fails, Certificate has been revoked Reviewed-by: phh, andrew Backport-of: d6bb846159be7e46fba0c3ca2915617f945e0b42 ! jdk/test/security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java Changeset: 5806429f Author: Severin Gehwolf Date: 2023-03-03 17:32:53 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/5806429f7ac582c400896a7ac61e147e93ddeac8 8245654: Add Certigna Root CA Reviewed-by: phh, andrew Backport-of: c8ee076241cc7d83f423683d97ec37f9e0d6ebaa + jdk/make/data/cacerts/certignaca + jdk/test/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java ! jdk/test/sun/security/lib/cacerts/VerifyCACerts.java Changeset: 7c5d77cb Author: Andrew John Hughes Date: 2023-03-08 02:58:56 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/7c5d77cbd2cf993643d48ded46342e01772a96cc Merge From andrew at openjdk.org Wed Mar 8 14:35:48 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Wed, 8 Mar 2023 14:35:48 GMT Subject: git: openjdk/jdk8u-dev: Added tag jdk8u372-b05 for changeset 5806429f Message-ID: Tagged by: Andrew John Hughes Date: 2023-03-07 01:43:33 +0000 Added tag jdk8u372-b05 for changeset 5806429f7ac Changeset: 5806429f Author: Severin Gehwolf Date: 2023-03-03 17:32:53 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/5806429f7ac582c400896a7ac61e147e93ddeac8 From andrew at openjdk.org Thu Mar 9 17:18:21 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Thu, 9 Mar 2023 17:18:21 GMT Subject: git: openjdk/jdk8u: 8303828: [Solaris] Broken jdk8u build after JDK-8266391 Message-ID: <6f4cddd7-bf08-4cc1-9a8c-354a1d4e0865@openjdk.org> Changeset: ebbd3a87 Author: Adam Farley Committer: Andrew John Hughes Date: 2023-03-09 17:15:22 +0000 URL: https://git.openjdk.org/jdk8u/commit/ebbd3a87b0c473a744499d5f7691e5207cd73186 8303828: [Solaris] Broken jdk8u build after JDK-8266391 Reviewed-by: sgehwolf, andrew = jdk/src/solaris/classes/jdk/internal/platform/SystemMetrics.java From zzambers at openjdk.org Tue Mar 14 18:36:51 2023 From: zzambers at openjdk.org (Zdenek Zambersky) Date: Tue, 14 Mar 2023 18:36:51 GMT Subject: git: openjdk/jdk8u-dev: 2 new changesets Message-ID: Changeset: a7fb08c2 Author: Zdenek Zambersky Date: 2023-03-14 18:32:07 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/a7fb08c286f0181a3bb725b88a7da8c651202be0 8293815: P11PSSSignature.engineUpdate should not print debug messages during normal operation Backport-of: 80615a6f39bf8929908804ce3f9f5c6d4b3f2864 ! jdk/src/share/classes/sun/security/pkcs11/P11PSSSignature.java Changeset: d6f81510 Author: Zdenek Zambersky Date: 2023-03-14 18:32:53 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/d6f8151053f40ccd8c23b9f9eecb40c306a6253f 8282600: SSLSocketImpl should not use user_canceled workaround when not necessary Backport-of: e80528bf2bd1c87fc1394dd32015281ac6652363 ! jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java From sgehwolf at openjdk.org Wed Mar 15 14:28:21 2023 From: sgehwolf at openjdk.org (Severin Gehwolf) Date: Wed, 15 Mar 2023 14:28:21 GMT Subject: git: openjdk/jdk8u: 8304053: Revert os specific stubs for SystemMetrics Message-ID: <8e0a6855-4d70-4508-baa4-4deee58ab89b@openjdk.org> Changeset: 89aeae16 Author: Adam Farley Committer: Severin Gehwolf Date: 2023-03-15 14:11:17 +0000 URL: https://git.openjdk.org/jdk8u/commit/89aeae16e85ddfbd581cb86d0b0480b1e2d50e99 8304053: Revert os specific stubs for SystemMetrics Reviewed-by: sgehwolf, andrew ! jdk/make/CompileJavaClasses.gmk - jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java - jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java - jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java From zzambers at openjdk.org Tue Mar 21 11:33:07 2023 From: zzambers at openjdk.org (Zdenek Zambersky) Date: Tue, 21 Mar 2023 11:33:07 GMT Subject: git: openjdk/jdk8u-dev: 2 new changesets Message-ID: Changeset: ad41d908 Author: Zdenek Zambersky Date: 2023-03-21 11:31:16 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/ad41d908eb4655782eb85272d28ccad80fa648eb 8293232: Fix race condition in pkcs11 SessionManager Backport-of: 939741c0a0a4a5ce2c68d14b15e1f42563bc653d ! jdk/src/share/classes/sun/security/pkcs11/SessionManager.java Changeset: ae6405fe Author: Zdenek Zambersky Date: 2023-03-21 11:31:56 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/ae6405fe642c8b5092c82ed22b41a281f49961b5 8289301: P11Cipher should not throw out of bounds exception during padding Reviewed-by: phh Backport-of: 7d8991978bbe1cc03ba2386f5e699239ba47934c ! jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java + jdk/test/sun/security/pkcs11/Cipher/TestPaddingOOB.java From zzambers at openjdk.org Tue Mar 21 11:35:53 2023 From: zzambers at openjdk.org (Zdenek Zambersky) Date: Tue, 21 Mar 2023 11:35:53 GMT Subject: git: openjdk/jdk8u-dev: 8152432: Implement setting jtreg @requires properties vm.flavor, vm.bits, vm.compMode Message-ID: <17843534-c3cf-4a0a-91b1-faaa9712e173@openjdk.org> Changeset: de0e5a2d Author: Zdenek Zambersky Date: 2023-03-21 11:32:39 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/de0e5a2dcb61d3827e38e56655f5263813bfcc0f 8152432: Implement setting jtreg @requires properties vm.flavor, vm.bits, vm.compMode Reviewed-by: phh, sgehwolf Backport-of: 24a9e0ac188a37dc57cc4d1bb8d8635abb4c4f89 ! hotspot/test/TEST.ROOT ! hotspot/test/runtime/Metaspace/MaxMetaspaceSizeTest.java ! hotspot/test/runtime/NMT/HugeArenaTracking.java ! hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java + test/jtreg-ext/requires/VMProps.java From andrew at openjdk.org Thu Mar 23 21:45:22 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Thu, 23 Mar 2023 21:45:22 GMT Subject: git: openjdk/jdk8u: Added tag jdk8u372-b06 for changeset 89aeae16 Message-ID: Tagged by: Andrew John Hughes Date: 2023-03-21 18:09:33 +0000 Added tag jdk8u372-b06 for changeset 89aeae16e85 Changeset: 89aeae16 Author: Adam Farley Committer: Severin Gehwolf Date: 2023-03-15 14:11:17 +0000 URL: https://git.openjdk.org/jdk8u/commit/89aeae16e85ddfbd581cb86d0b0480b1e2d50e99 From phh at openjdk.org Mon Mar 27 14:50:00 2023 From: phh at openjdk.org (Paul Hohensee) Date: Mon, 27 Mar 2023 14:50:00 GMT Subject: git: openjdk/jdk8u-dev: 8302791: Add specific ClassLoader object to Proxy IllegalArgumentException message Message-ID: Changeset: ca1c3b1e Author: Ravali Yatham Committer: Paul Hohensee Date: 2023-03-27 14:49:05 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/ca1c3b1efd8fbe0716e2e6e3b287856299e9ceef 8302791: Add specific ClassLoader object to Proxy IllegalArgumentException message Reviewed-by: phh Backport-of: 9f9d678591e02ecaeae7b81eeefb0ba41c7b4dae ! jdk/src/share/classes/java/lang/reflect/Proxy.java From sgehwolf at openjdk.org Mon Mar 27 15:51:33 2023 From: sgehwolf at openjdk.org (Severin Gehwolf) Date: Mon, 27 Mar 2023 15:51:33 GMT Subject: git: openjdk/jdk8u-dev: 8295530: Update Zlib Data Compression Library to Version 1.2.13 Message-ID: <55ad9dcc-8754-4691-8851-9997346a1d26@openjdk.org> Changeset: 5dc33f2c Author: Stewart X Addison Committer: Severin Gehwolf Date: 2023-03-27 15:49:33 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/5dc33f2c9c4de56b76ee56a3526c2fa21394aea2 8295530: Update Zlib Data Compression Library to Version 1.2.13 Reviewed-by: andrew, sgehwolf Backport-of: 6042c6b9bbacbff1bd47f087f0f19646a20eef97 ! THIRD_PARTY_README ! jdk/src/share/native/java/util/zip/zlib/README ! jdk/src/share/native/java/util/zip/zlib/compress.c ! jdk/src/share/native/java/util/zip/zlib/crc32.h ! jdk/src/share/native/java/util/zip/zlib/deflate.c ! jdk/src/share/native/java/util/zip/zlib/deflate.h ! jdk/src/share/native/java/util/zip/zlib/gzguts.h ! jdk/src/share/native/java/util/zip/zlib/gzlib.c ! jdk/src/share/native/java/util/zip/zlib/gzread.c ! jdk/src/share/native/java/util/zip/zlib/gzwrite.c ! jdk/src/share/native/java/util/zip/zlib/infback.c ! jdk/src/share/native/java/util/zip/zlib/inffast.c ! jdk/src/share/native/java/util/zip/zlib/inflate.c ! jdk/src/share/native/java/util/zip/zlib/inflate.h ! jdk/src/share/native/java/util/zip/zlib/inftrees.c ! jdk/src/share/native/java/util/zip/zlib/inftrees.h ! jdk/src/share/native/java/util/zip/zlib/patches/ChangeLog_java ! jdk/src/share/native/java/util/zip/zlib/trees.c ! jdk/src/share/native/java/util/zip/zlib/uncompr.c ! jdk/src/share/native/java/util/zip/zlib/zconf.h ! jdk/src/share/native/java/util/zip/zlib/zcrc32.c ! jdk/src/share/native/java/util/zip/zlib/zlib.h ! jdk/src/share/native/java/util/zip/zlib/zutil.c ! jdk/src/share/native/java/util/zip/zlib/zutil.h From andrew at openjdk.org Tue Mar 28 18:25:05 2023 From: andrew at openjdk.org (Andrew John Hughes) Date: Tue, 28 Mar 2023 18:25:05 GMT Subject: git: openjdk/jdk8u-dev: 3 new changesets Message-ID: Changeset: ebbd3a87 Author: Adam Farley Committer: Andrew John Hughes Date: 2023-03-09 17:15:22 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/ebbd3a87b0c473a744499d5f7691e5207cd73186 8303828: [Solaris] Broken jdk8u build after JDK-8266391 Reviewed-by: sgehwolf, andrew = jdk/src/solaris/classes/jdk/internal/platform/SystemMetrics.java Changeset: 89aeae16 Author: Adam Farley Committer: Severin Gehwolf Date: 2023-03-15 14:11:17 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/89aeae16e85ddfbd581cb86d0b0480b1e2d50e99 8304053: Revert os specific stubs for SystemMetrics Reviewed-by: sgehwolf, andrew ! jdk/make/CompileJavaClasses.gmk - jdk/src/aix/classes/jdk/internal/platform/SystemMetrics.java - jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java - jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java Changeset: cd40350f Author: Andrew John Hughes Date: 2023-03-28 18:24:15 +0000 URL: https://git.openjdk.org/jdk8u-dev/commit/cd40350f0e69faf4d9a4658408798eb6e389f573 Merge Reviewed-by: sgehwolf