dtitov [Wed, 06 Mar 2019 09:30:05 -0800] rev 54012
8218464: vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java failed
Reviewed-by: sspitsyn, gadams
stuefe [Thu, 28 Feb 2019 14:22:03 +0100] rev 54011
8219650: [Testbug] Fix potential crashes in new test hotspot gtest "test_print_hex_dump"
Reviewed-by: clanger, shade
lucy [Wed, 06 Mar 2019 12:14:47 +0100] rev 54010
8219214: Infinite Loop in CodeSection::dump()
Reviewed-by: kvn, thartmann
rehn [Wed, 06 Mar 2019 11:15:16 +0100] rev 54009
8220151: SafepointTracing::end_of_last_safepoint_ms should return ms since epoch.
Reviewed-by: dholmes, redestad
jiefu [Thu, 28 Feb 2019 09:43:23 +0800] rev 54008
8219519: Remove linux_sparc.ad and linux_aarch64.ad
Reviewed-by: thartmann, pli, adinn
vdeshpande [Tue, 05 Mar 2019 21:26:14 -0800] rev 54007
8220211: Small update to Fix generation of VNNI vector code by allowing adjacent LoadS nodes to be isomorphic (JDK-8216580)
Reviewed-by: kvn
kbarrett [Tue, 05 Mar 2019 19:54:33 -0500] rev 54006
8219613: Use NonJavaThread PtrQueues
Summary: Init and use NJT queues, remove shared SATB queue.
Reviewed-by: shade, zgu, pliden, tschatzl
Contributed-by: kim.barrett@oracle.com, shade@redhat.com
vdeshpande [Tue, 05 Mar 2019 14:07:30 -0800] rev 54005
8216580: Fix generation of VNNI vector code by allowing adjacent LoadS nodes to be isomorphic
Reviewed-by: kvn, thartmann, rraghavan
dtitov [Tue, 05 Mar 2019 13:41:35 -0800] rev 54004
8218167: nsk/jvmti/scenarios/sampling/SP02/sp02t003 fails
Reviewed-by: dlong, cjplummer
cjplummer [Tue, 05 Mar 2019 13:40:05 -0800] rev 54003
8220030: JdbStopThreadidTest.java failed due to "Unexpected IO error while writing command 'quit' to jdb stdin stream"
Summary: Use contToExit(1) for safer approach to test exit.
Reviewed-by: gadams, amenkov
jjg [Tue, 05 Mar 2019 10:35:29 -0800] rev 54002
8219946: Set class on body elements
Reviewed-by: hannesw
simonis [Tue, 05 Mar 2019 18:53:54 +0100] rev 54001
8220164: Fix build instructions for AIX
Reviewed-by: mdoerr, erikj, mbaesken
zgu [Tue, 05 Mar 2019 12:30:47 -0500] rev 54000
8220161: Shenandoah does not need to initialize PLABs for safepoint workers
Reviewed-by: shade
mbaesken [Tue, 05 Mar 2019 09:55:00 +0100] rev 53999
8219920: dependency help output in configure-step : support zypper tool
Reviewed-by: erikj, ihse
mullan [Tue, 05 Mar 2019 08:24:58 -0500] rev 53998
8217878: ENVELOPING XML signature no longer works in JDK 11
8218629: XML Digital Signature throws NAMESPACE_ERR exception on OpenJDK 11, works 8/9/10
Summary: Backout and restore previous XML signature marshalling implementation
Reviewed-by: weijun
ihse [Tue, 05 Mar 2019 13:41:36 +0100] rev 53997
8220155: JDK-8219971 broke hotspot build
Reviewed-by: dholmes
aoqi [Tue, 05 Mar 2019 11:09:52 +0100] rev 53996
8219906: Update test documentation with default test jobs settings
Reviewed-by: ihse
ihse [Tue, 05 Mar 2019 11:07:19 +0100] rev 53995
8219971: Introduce SetupExecute in build system
Reviewed-by: erikj
dholmes [Mon, 04 Mar 2019 19:38:50 -0500] rev 53994
8219974: REDO JDK-8219492: Restore static callsite resolution for the current class
Reviewed-by: redestad, vlivanov, coleenp
erikj [Mon, 04 Mar 2019 11:28:52 -0800] rev 53993
8219986: Change to Xcode 10.1 for building on Macosx at Oracle
Reviewed-by: tbell
erikj [Mon, 04 Mar 2019 11:30:27 -0800] rev 53992
8219988: Change to Visual Studio 2017 15.9.6 for building on Windows at Oracle
Reviewed-by: tbell
jjg [Mon, 04 Mar 2019 11:19:34 -0800] rev 53991
8219801: Pages do not have <h1>
Reviewed-by: hannesw
kevinw [Fri, 01 Mar 2019 04:34:28 -0800] rev 53990
8219513: compiler/codegen/aes/TestCipherBlockChainingEncrypt.java timeout on Solaris-sparc
Reviewed-by: kvn, iignatyev
Contributed-by: fairoz.matte@oracle.com
fyang [Fri, 01 Mar 2019 14:38:59 +0800] rev 53989
8219888: aarch64: add CPU detection code for HiSilicon TSV110
Reviewed-by: aph, drwhite, pzhang
Contributed-by: dongbo4@huawei.com
gadams [Mon, 04 Mar 2019 08:45:05 -0500] rev 53988
4903717: nsk/jdi/ThreadReference/isSuspended/issuspended002 failing
Reviewed-by: amenkov, sspitsyn
tschatzl [Mon, 04 Mar 2019 11:49:16 +0100] rev 53987
8219856: Spell out G1CollectorPolicy::is_hetero_heap
Reviewed-by: sangheki, kbarrett
tschatzl [Mon, 04 Mar 2019 11:49:16 +0100] rev 53986
8219748: Add and use getter for the timing object in G1
Reviewed-by: shade, kbarrett
tschatzl [Mon, 04 Mar 2019 11:49:16 +0100] rev 53985
8219747: Remove g1_ prefix to g1_remset and g1_policy members in G1CollectedHeap
Reviewed-by: shade, sangheki
tschatzl [Mon, 04 Mar 2019 11:49:16 +0100] rev 53984
8219369: Add named constants for iterating ExtRootScan phases
Reviewed-by: kbarrett, sangheki
tschatzl [Mon, 04 Mar 2019 11:49:16 +0100] rev 53983
8218880: G1 crashes when issuing a periodic GC while the GCLocker is held
Summary: Do not wait for the GC locker in the periodic GC thread as the GC locker being held is an indication for being busy anyway.
Reviewed-by: kbarrett, shade
jlahoda [Mon, 04 Mar 2019 10:19:35 +0100] rev 53982
8217868: Crash for overlap between source path and patch module path
Summary: When analyzing implicit files, do not look for containing module, but rather use the already known one.
Reviewed-by: jjg
dholmes [Sat, 02 Mar 2019 18:09:18 -0500] rev 53981
8219619: Remove UseFakeTimers and related code
Reviewed-by: zgu, redestad
zgu [Sat, 02 Mar 2019 08:33:32 -0500] rev 53980
8219976: GarbageCollectionNotificationInfo always says "No GC" when running Shenandoah
Reviewed-by: rkennke
dchuyko [Sat, 02 Mar 2019 11:42:04 +0300] rev 53979
8214854: JDWP: Unforseen output truncation in logging
Reviewed-by: cjplummer, dholmes
xuelei [Fri, 01 Mar 2019 13:08:41 -0800] rev 53978
8219994: CheckSecurityProvider.java fails with unexpected sun.security.ssl.SunJSSE
Reviewed-by: mullan, wetmore
igerasim [Fri, 01 Mar 2019 12:47:30 -0800] rev 53977
8218228: The constructor StringBuffer(CharSequence) violates spec for negatively sized argument
Reviewed-by: rriggs, darcy
jjg [Fri, 01 Mar 2019 11:01:49 -0800] rev 53976
8219803: Nodeca Pako license text needs to be inserted in JSZip license text
Reviewed-by: darcy
jiefu [Fri, 01 Mar 2019 10:00:03 -0800] rev 53975
8219919: RuntimeStub name lost with PrintFrameConverterAssembly
Reviewed-by: kvn
xuelei [Fri, 01 Mar 2019 09:42:04 -0800] rev 53974
8219990: Backout JDK-8219658
Reviewed-by: dfuchs
mdoerr [Fri, 01 Mar 2019 17:48:53 +0100] rev 53973
8219582: PPC: Crash after C1 checkcast patched and GC
Reviewed-by: akozlov, goetz
xuelei [Fri, 01 Mar 2019 08:35:14 -0800] rev 53972
8215430: Remove the internal package com.sun.net.ssl
Reviewed-by: chegar, mullan, wetmore
dholmes [Fri, 01 Mar 2019 08:14:29 -0500] rev 53971
8219969: Backout JDK-8219492
Reviewed-by: goetz, hseigel, tschatzl
stuefe [Sun, 10 Feb 2019 09:10:42 +0100] rev 53970
8218988: Improve metaspace verifications
Reviewed-by: zgu, coleenp
clanger [Fri, 01 Mar 2019 10:15:04 +0000] rev 53969
8219915: [TESTBUG] Fix test langtools/tools/javac/processing/model/completionfailure/SymbolsDontCumulate.java in Standalone mode
Reviewed-by: jlahoda
mbaesken [Thu, 28 Feb 2019 10:28:34 +0100] rev 53968
8219746: Provide virtualization related info in the hs_error file on linux ppc64 / ppc64le
Reviewed-by: dholmes, lucy, mdoerr
ngasson [Tue, 19 Feb 2019 14:11:52 +0800] rev 53967
8209413: AArch64: NPE in clhsdb jstack command
Reviewed-by: aph
kvn [Thu, 28 Feb 2019 17:16:40 -0800] rev 53966
8219951: Build failure on Mac and Windows after JDK-8219922
Summary: Add missing parentheses.
Reviewed-by: dholmes
dholmes [Thu, 28 Feb 2019 18:28:23 -0500] rev 53965
8219492: Restore static callsite resolution for the current class
Reviewed-by: redestad, lfoltan, vlivanov
naoto [Thu, 28 Feb 2019 14:05:58 -0800] rev 53964
Merge
naoto [Thu, 28 Feb 2019 14:03:04 -0800] rev 53963
8219890: Calendar.getDisplayName() returns empty string for new Japanese Era on some locales
Reviewed-by: lancea
coleenp [Thu, 28 Feb 2019 16:30:31 -0500] rev 53962
8218266: G1 crash in AccessInternal::PostRuntimeDispatch
Summary: protection_domains can be unloaded in the dictionary pd_set.
Reviewed-by: zgu, hseigel
redestad [Thu, 28 Feb 2019 22:11:46 +0100] rev 53961
8219922: Simplify and optimize IndexSetIterator::next using count_trailing_zeros
Reviewed-by: kvn, neliasso
dtitov [Thu, 28 Feb 2019 13:12:26 -0800] rev 53960
8207367: 10 vmTestbase/nsk/jdi tests timed out when running with jtreg
Reviewed-by: sspitsyn, cjplummer
bpb [Thu, 28 Feb 2019 12:05:59 -0800] rev 53959
5071718: (bf) Add ByteBuffer.slice(int offset, int length)
Reviewed-by: alanb, bchristi, darcy, rriggs
xuelei [Thu, 28 Feb 2019 10:04:27 -0800] rev 53958
8219658: Deadlock in sun.security.ssl.SSLSocketImpl
Reviewed-by: jnimeh
iignatyev [Thu, 28 Feb 2019 09:10:58 -0800] rev 53957
8219798: [deadcode] remove src/hotspot/share/prims/evmCompat.cpp
Reviewed-by: dholmes
iignatyev [Thu, 28 Feb 2019 09:10:46 -0800] rev 53956
8219565: [deadcode] remove share/utilities/intHisto.*
Reviewed-by: dholmes
gziemski [Thu, 28 Feb 2019 11:04:06 -0600] rev 53955
8212932: [TESTBUG] Clean up TestVirtualSpaceNode test
Summary: Remove test/hotspot/gtest/memory/test_virtualSpaceNode.cpp
Reviewed-by: stuefe, coleenp
gziemski [Thu, 28 Feb 2019 10:55:07 -0600] rev 53954
8219789: [TESTBUG] TestOptionsWithRanges.java produces hs_err_pidXXXXX.log file for VMThreadStackSize=9007199254740991
Summary: Excluded test of mac range for VMThreadStackSize
Reviewed-by: coleenp, mseledtsov
zgu [Thu, 28 Feb 2019 08:44:09 -0500] rev 53953
8219857: Shenandoah GC may initialize thread's gclab twice
Reviewed-by: rkennke
goetz [Thu, 28 Feb 2019 13:53:38 +0100] rev 53952
8219714: [testbug] com/sun/jdi/RedefineNestmateAttr/TestNestmateAttr.java must pass classpath to subprocess
Reviewed-by: dholmes, dcubed
rschmelter [Tue, 26 Feb 2019 05:46:02 -0800] rev 53951
8219712: code_size2 (defined in stub_routines_x86.hpp) is too small on new Skylake CPUs
Reviewed-by: mbaesken, dholmes, kvn
pli [Thu, 28 Feb 2019 16:37:28 +0800] rev 53950
8216259: AArch64: Vectorize Adler32 intrinsics
Reviewed-by: aph
jjiang [Thu, 28 Feb 2019 13:37:03 +0800] rev 53949
8219723: javax/net/ssl/compatibility/Compatibility.java failed on some SNI cases
Summary: Re-generates RSA and ECDSA certificates and set longer validity period
Reviewed-by: xuelei
jwilhelm [Thu, 28 Feb 2019 02:47:39 +0100] rev 53948
Added tag jdk-13+10 for changeset 8e069f7b4fab
darcy [Wed, 27 Feb 2019 12:19:29 -0800] rev 53947
8218726: Minor Throwable.printStackTrace() typos
Reviewed-by: bpb
valeriep [Wed, 27 Feb 2019 19:40:18 +0000] rev 53946
Merge
valeriep [Wed, 27 Feb 2019 19:37:51 +0000] rev 53945
8183107: PKCS11 regression regarding checkKeySize
Summary: Changed key size check in PKCS11 provider to only enforce positive return values
Reviewed-by: jnimeh
darcy [Wed, 27 Feb 2019 11:33:57 -0800] rev 53944
8219805: Cross-link javax.lang.model.{type, element} packages to utility interfaces
Reviewed-by: vromero
fyang [Tue, 26 Feb 2019 10:52:31 +0800] rev 53943
8219698: aarch64: SIGILL triggered when specifying unsupported hardware features
Reviewed-by: aph
amlu [Wed, 27 Feb 2019 18:58:29 +0800] rev 53942
8219802: Problem list java/net/MulticastSocket/SetGetNetworkInterfaceTest.java
Reviewed-by: chegar, clanger
dchuyko [Wed, 27 Feb 2019 13:13:15 +0300] rev 53941
8215009: GCC 8 compilation error in libjli
Reviewed-by: dholmes, mikael, rriggs
psadhukhan [Wed, 27 Feb 2019 14:45:17 +0530] rev 53940
Merge
psadhukhan [Wed, 27 Feb 2019 13:53:41 +0530] rev 53939
Merge
psadhukhan [Tue, 26 Feb 2019 11:17:12 +0530] rev 53938
Merge
psadhukhan [Tue, 26 Feb 2019 11:08:07 +0530] rev 53937
8213781: web page background renders blue in JEditorPane
4895924: Strings in format #rgb not handled by Color.decode() (affects CSS / Swing)
Reviewed-by: serb, sveerabhadra
sveerabhadra [Mon, 25 Feb 2019 11:02:53 +0530] rev 53936
8212202: [Windows] Exception if no printers are installed.
Reviewed-by: prr
sveerabhadra [Thu, 21 Feb 2019 12:27:39 +0530] rev 53935
8213071: [macos] The focus disappears after pressing return to close the "That was a pretty good movie!" dialog.
Reviewed-by: serb
sveerabhadra [Thu, 21 Feb 2019 11:10:35 +0530] rev 53934
8190361: Incorrect version info in jaccessinspector.exe and jaccesswalker.exe
Reviewed-by: prr, mhalder
psadhukhan [Thu, 21 Feb 2019 10:33:24 +0530] rev 53933
8219156: RTFEditorKit writes background color but doesn't read
Reviewed-by: serb
shade [Wed, 27 Feb 2019 10:03:22 +0100] rev 53932
8219814: Help-info for pns(...) on Linux/mips lost
Reviewed-by: aoqi, shade
Contributed-by: Jie Fu <fujie@loongson.cn>
mbaesken [Tue, 26 Feb 2019 09:57:11 +0100] rev 53931
8219630: cleanup hotspot ostream.cpp
Reviewed-by: clanger, dholmes, stuefe
valeriep [Wed, 27 Feb 2019 02:49:52 +0000] rev 53930
8218780: Update MUSCLE PCSC-Lite header files
Summary: update the PCSC-lite header files to 1.8.24 release
Reviewed-by: coffeys
amenkov [Tue, 26 Feb 2019 15:29:08 -0800] rev 53929
8181383: com/sun/jdi/OptionTest.java fails intermittently with bind failed: Address already in use
Reviewed-by: sspitsyn, cjplummer
fyang [Mon, 25 Feb 2019 18:50:29 +0800] rev 53928
8219635: aarch64: missing LoadStore barrier in TemplateTable::fast_storefield
Reviewed-by: aph
Contributed-by: patrick@os.amperecomputing.com
lancea [Tue, 26 Feb 2019 13:14:26 -0500] rev 53927
8219548: Better Null paramenter checking in ToolProvider
Reviewed-by: lancea, alanb, jjg
Contributed-by: Philipp Kunz <philipp.kunz@paratix.ch>
aleonard [Tue, 19 Feb 2019 16:13:05 +0000] rev 53926
8219378: Ensure ReflectionFactory.langReflectAccess is initialized correctly
Reviewed-by: rriggs, alanb, mchung
Contributed-by: andrew_m_leonard@uk.ibm.com
ecaspole [Tue, 26 Feb 2019 10:39:28 -0500] rev 53925
8219664: LogCompilation: java.lang.Error: Unexpected method mismatch during late inlining
Summary: Set lateInlining=true in task endElement
Reviewed-by: vlivanov, kvn
coleenp [Tue, 26 Feb 2019 08:01:20 -0500] rev 53924
8181171: Deleting method for RedefineClasses breaks ResolvedMethodName
8210457: JVM crash in ResolvedMethodTable::add_method(Handle)
Summary: Add a function to call NSME in ResolvedMethodTable to replace deleted methods.
Reviewed-by: sspitsyn, dholmes, dcubed
sgehwolf [Wed, 13 Feb 2019 12:01:09 +0100] rev 53923
8218913: Rename --strip-debug jlink plugin
Reviewed-by: alanb, mchung
eosterlund [Tue, 26 Feb 2019 11:38:07 +0100] rev 53922
8219638: ZGC: Free ZNMethodDataOops under a lock
Reviewed-by: pliden
eosterlund [Tue, 26 Feb 2019 11:36:00 +0100] rev 53921
8218974: Free GC native structures in nmethod::flush
Reviewed-by: pliden
nishjain [Tue, 26 Feb 2019 14:57:23 +0530] rev 53920
8209175: Handle 'B' character introduced in CLDR 33 JDK update for Burmese (my) locale
Reviewed-by: naoto, rriggs
rschmelter [Fri, 22 Feb 2019 04:59:12 -0800] rev 53919
8219577: Returning NULL in a function which returns bools
Reviewed-by: shade, zgu, clanger
cjplummer [Mon, 25 Feb 2019 18:54:40 -0800] rev 53918
8219143: jdb should support breakpoint thread filters
Summary: add thread filter to stop command.
Reviewed-by: sspitsyn, amenkov
mikael [Mon, 25 Feb 2019 16:05:06 -0800] rev 53917
8219675: Disable harfbuzz warnings with gcc 8
Reviewed-by: erikj, prr
jjiang [Tue, 26 Feb 2019 07:26:29 +0800] rev 53916
8215524: Finished message validation failure should be decrypt_error alert
Reviewed-by: xuelei
darcy [Mon, 25 Feb 2019 14:45:29 -0800] rev 53915
8219561: Update jdeprscan to avoid the need for start-of-release changes
Reviewed-by: dfuchs, lancea, smarks
mseledtsov [Mon, 25 Feb 2019 08:16:20 -0800] rev 53914
8219553: [TESTBUG] Problem list JFR TestPeriod test
Summary: Problem listed the test
Reviewed-by: egahlin
mullan [Mon, 25 Feb 2019 08:25:23 -0500] rev 53913
8159525: Add @FunctionalInterface annotation to PrivilegedAction and PrivilegedExceptionAction
Reviewed-by: clanger
jgeorge [Mon, 25 Feb 2019 13:50:32 +0530] rev 53912
8214756: SA should ignore archived java heap objects that are not in use
Summary: Ignore objects, the associated classes of which are unloaded while walking the heap to create a heapdump
Reviewed-by: jiangli, redestad
mbaesken [Mon, 18 Feb 2019 16:17:48 +0100] rev 53911
8218811: replace open by os::open in hotspot coding
Reviewed-by: dholmes, iklam, stuefe
dholmes [Sun, 24 Feb 2019 16:10:52 -0500] rev 53910
8208278: [mlvm] [TESTBUG] vm.mlvm.mixed.stress.java.findDeadlock.INDIFY_Test Deadlocked threads are not always detected
Reviewed-by: iignatyev
vromero [Sat, 23 Feb 2019 19:41:53 -0500] rev 53909
8219480: j.l.c.ClassDesc::arrayType(int rank) throws IllegalArgumentException if rank = 0
Reviewed-by: mchung, briangoetz
shade [Sat, 23 Feb 2019 10:55:45 +0100] rev 53908
8219583: Windows build failure after JDK-8214777 (Avoid some GCC 8.X strncpy() errors in HotSpot)
Reviewed-by: kbarrett, mikael
mikael [Fri, 22 Feb 2019 18:54:23 -0800] rev 53907
8219611: Remove superfluous sigfillset code
Reviewed-by: dholmes
iignatyev [Fri, 22 Feb 2019 14:39:57 -0800] rev 53906
8209807: improve handling exception in requires.VMProps
Reviewed-by: vlivanov, mseledtsov
stefank [Fri, 22 Feb 2019 20:42:01 +0100] rev 53905
8219571: ProblemList serviceability/sa/TestJmapCoreMetaspace.java
Reviewed-by: iignatyev
coleenp [Fri, 22 Feb 2019 13:56:08 -0500] rev 53904
8078725: method adjustments can be done just once for all classes involved into redefinition
Summary: walk all classes at the end of redefinition and adjust method entries and clean MethodData
Reviewed-by: sspitsyn
iignatyev [Fri, 22 Feb 2019 11:07:18 -0800] rev 53903
8219158: use 'test.root' property instead of traversing test-src path
Reviewed-by: dholmes
bpb [Fri, 22 Feb 2019 10:13:34 -0800] rev 53902
8048192: (bf) Out of direct buffer memory message should include the limits
Reviewed-by: alanb, rriggs
bpb [Fri, 22 Feb 2019 10:13:33 -0800] rev 53901
8011135: (bf) CharBuffer.put(String) is slow because of String.charAt() call for each char
Reviewed-by: alanb, redestad
iignatyev [Fri, 22 Feb 2019 09:47:00 -0800] rev 53900
8219417: bump jtreg requiredVersion to b14
Reviewed-by: alanb, dholmes
shade [Fri, 22 Feb 2019 17:54:13 +0100] rev 53899
8219574: Minimal VM build failure after JDK-8219414
Reviewed-by: jgeorge, dholmes, cjplummer
redestad [Fri, 22 Feb 2019 16:41:01 +0100] rev 53898
8219554: Redundant lookup_common in SymbolTable::add
Reviewed-by: iklam, coleenp, mikael
bulasevich [Fri, 22 Feb 2019 17:30:07 +0300] rev 53897
8217647: JFR: recordings on 32-bit systems unreadable
Reviewed-by: egahlin
Contributed-by: boris.ulasevich@bell-sw.com, markus.gronlund@oracle.com
pmuthuswamy [Fri, 22 Feb 2019 19:58:22 +0530] rev 53896
8219575: jdk/javadoc/tool/removeOldDoclet/RemoveOldDoclet test fails in mach5
Reviewed-by: hannesw
rehn [Fri, 22 Feb 2019 14:20:06 +0100] rev 53895
8219436: Safepoint logs correction and misc
Reviewed-by: mdoerr, coleenp
stefank [Thu, 21 Feb 2019 14:24:44 +0100] rev 53894
8219469: ZGC: Extract functions out from ZNMethodTable into new ZNMethod class
Reviewed-by: pliden
stefank [Wed, 20 Feb 2019 12:04:12 +0100] rev 53893
8219468: ZGC: Extract iteration functionality into a new ZNMethodTableIteration class
Reviewed-by: pliden