serb [Fri, 05 Dec 2014 12:41:29 +0300] rev 28086
8059998: Broken link in java.awt.event Interface KeyListener
Reviewed-by: ant, alexsch
prr [Wed, 03 Dec 2014 11:52:40 -0800] rev 28085
Merge
serb [Wed, 03 Dec 2014 18:04:50 +0300] rev 28084
8024626: CTW CRASH: SIGSEGV in ctw/jre/lib/rt_jar/preloading_1 and ctw/jre/lib/rt_jar/sun_awt_X11_ListHelper
Reviewed-by: azvegint, alexsch
serb [Wed, 03 Dec 2014 15:43:25 +0300] rev 28083
6345095: regression test EmptyClipRenderingTest fails
Reviewed-by: azvegint, alexsch
alexsch [Wed, 03 Dec 2014 14:25:49 +0300] rev 28082
8066142: Edit the value in the text field and then press the tab key, the number don't increase
Reviewed-by: serb, azvegint
azvegint [Tue, 02 Dec 2014 12:48:49 +0300] rev 28081
8064699: [parfait] JNI primitive type mismatch in jdk/src/java/desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
Reviewed-by: alexsch, serb
azvegint [Tue, 02 Dec 2014 12:47:12 +0300] rev 28080
8064698: [parfait] JNI exception pending in jdk/src/java/desktop/unix/native: libawt_xawt/awt/, common/awt
Reviewed-by: alexsch, serb
azvegint [Tue, 02 Dec 2014 12:45:40 +0300] rev 28079
8064700: [parfait] Function Call Mismatch in jdk/src/java/desktop/unix/native/libawt_xawt/xawt/XToolkit.c
Reviewed-by: alexsch, serb
serb [Sun, 30 Nov 2014 15:43:08 +0300] rev 28078
8029536: JFileChooser filter uses .toString() instead of getDescription() for filter text on GTK laf
Reviewed-by: azvegint, alexsch
alexsch [Fri, 28 Nov 2014 19:17:00 +0400] rev 28077
8031696: [macosx] TwentyThousandTest test failed with OOM
Reviewed-by: serb, pchelko
serb [Fri, 28 Nov 2014 14:03:56 +0300] rev 28076
8059944: [OGL] Metrics for a method choice copying of texture should be improved
Reviewed-by: bae, prr
serb [Fri, 28 Nov 2014 13:55:09 +0300] rev 28075
8061832: J2DBench can be improved
Reviewed-by: prr, bae
serb [Fri, 28 Nov 2014 10:42:03 +0000] rev 28074
8059942: Default implementation of DrawImage.renderImageXform() should be improved for d3d/ogl
Reviewed-by: flar, prr
alexsch [Thu, 27 Nov 2014 14:27:46 +0300] rev 28073
8065098: JColorChooser no longer supports drag and drop between two JVM instances
Reviewed-by: serb, pchelko
prr [Tue, 25 Nov 2014 12:14:42 -0800] rev 28072
Merge
yan [Fri, 21 Nov 2014 16:11:03 +0300] rev 28071
8063107: Change open swing regression tests to avoid sun.awt.SunToolkit.realSync, part 2
8064573: [TEST_BUG] javax/swing/text/AbstractDocument/6968363/Test6968363.java is asocial pressing VK_LEFT and not releasing
8064575: [TEST_BUG] javax/swing/JEditorPane/6917744/bug6917744.java 100 times press keys and never releases
8064809: [TEST_BUG] javax/swing/JComboBox/4199622/bug4199622.java contains a lot of keyPress and not a single keyRelease
Reviewed-by: alexsch, pchelko
pchelko [Wed, 19 Nov 2014 16:42:19 +0400] rev 28070
8058193: [macosx] Potential incomplete fix for JDK-8031485
Reviewed-by: alexsch, serb
avstepan [Wed, 19 Nov 2014 14:12:59 +0400] rev 28069
8054143: move awt automated tests from AWT_Modality to OpenJDK repository - part 6
Reviewed-by: pchelko
avstepan [Tue, 18 Nov 2014 17:10:34 +0400] rev 28068
8054359: move awt automated tests from AWT_Modality to OpenJDK repository - part 8
Summary: Some new tests to check FileDialog modality behavior
Reviewed-by: alexsch, pchelko
avstepan [Tue, 18 Nov 2014 16:32:04 +0400] rev 28067
8055836: move awt tests from AWT_Modality to OpenJDK repository - part 9
Summary: Some modality tests for Print dialog were added
Reviewed-by: pchelko
dfuchs [Tue, 16 Dec 2014 17:32:56 +0100] rev 28066
8066612: Add a test that will call getDeclaredFields() on all classes and try to set them accessible.
Summary: This test use the jrt:/ file system to find the name of all classes, then loads each of them, get their declared fields, and attempt to call setAccessible.
Reviewed-by: coffeys, dholmes, plevart
prappo [Tue, 16 Dec 2014 12:43:36 +0000] rev 28065
8066867: Add InputStream transferTo to transfer content to an OutputStream
Reviewed-by: chegar
Contributed-by: Alan Bateman <alan.bateman@oracle.com>, Chris Hegarty <chris.hegarty@oracle.com>, Patrick Reinhart <patrick@reini.net>, Pavel Rappo <pavel.rappo@oracle.com>
sherman [Tue, 16 Dec 2014 04:58:34 +0000] rev 28064
8067289: Fix deprecation warnings in java.base module - CRC32C
Summary: to remove the deprecation warning in CRC32C class
Reviewed-by: darcy
Contributed-by: staffan.friberg@oracle.com
rriggs [Mon, 15 Dec 2014 17:36:20 -0500] rev 28063
8067486: Add diagnostics for Exception: Read from closed pipe hang
Reviewed-by: lancea
bpb [Mon, 15 Dec 2014 12:09:49 -0800] rev 28062
8025619: (fc) FileInputStream.getChannel on closed stream returns FileChannel that doesn't know that stream is closed
Summary: If the stream is closed ensure getChannel() returns a closed channel. Also, FileKey.create() should throw an IOException directly instead of wrapping it in an Error.
Reviewed-by: alanb
sjiang [Mon, 15 Dec 2014 19:21:59 +0100] rev 28061
8067241: DeadlockTest.java failed with negative timeout value
Reviewed-by: dfuchs, sspitsyn
chegar [Sat, 13 Dec 2014 20:22:21 +0000] rev 28060
8067112: Update java/util/Collections/EmptyIterator.java to eliminate dependency on sun.tools.java
Reviewed-by: chegar, prappo
Contributed-by: Amy Lu <amy.lu@oracle.com>
martin [Thu, 30 Oct 2014 07:31:41 -0700] rev 28059
8067377: My hobby: caning, then then canning, the the can-can
Summary: Fix ALL the stutters!
Reviewed-by: rriggs, mchung, lancea
rriggs [Fri, 12 Dec 2014 15:07:00 -0500] rev 28058
8056238: (process) ProcessBuilder.redirectError spec has a broken link
Reviewed-by: lancea
martin [Wed, 10 Dec 2014 09:23:00 -0800] rev 28057
8065804: JEP 171: Clarifications/corrections for fence intrinsics
Reviewed-by: dholmes, shade, dl, psandoz
martin [Fri, 21 Nov 2014 16:30:02 -0800] rev 28056
8065172: More core reflection final and volatile annotations
Summary: more fiddling with "final" and "volatile" field modifiers
Reviewed-by: jfranck, plevart, psandoz
erikj [Fri, 12 Dec 2014 15:35:21 +0100] rev 28055
8067254: No debug symbols in JPRT Windows builds
Reviewed-by: tbell
sjiang [Fri, 12 Dec 2014 14:31:26 +0100] rev 28054
8066952: [TEST-BUG] javax/management/monitor/CounterMonitorTest.java hangs
Reviewed-by: dfuchs
smarks [Thu, 11 Dec 2014 18:40:05 -0800] rev 28053
8066633: Fix deprecation warnings in java.rmi module
Reviewed-by: darcy, lancea
lana [Thu, 18 Dec 2014 19:57:52 -0800] rev 28052
Added tag jdk9-b43 for changeset 52310706ed47
duke [Wed, 05 Jul 2017 20:11:32 +0200] rev 28051
Merge
lana [Tue, 23 Dec 2014 13:57:53 -0800] rev 28050
Merge
amurillo [Thu, 11 Dec 2014 23:06:14 -0800] rev 28049
Merge
anoll [Thu, 11 Dec 2014 16:22:47 -0800] rev 28048
Merge
roland [Wed, 10 Dec 2014 16:45:55 +0100] rev 28047
8067144: SIGSEGV with +TraceDeoptimization in Deoptimization::print_objects
Summary: -XX:+TraceDeoptimization tries to print realloc'ed objects even when there are none
Reviewed-by: kvn
iveresov [Tue, 09 Dec 2014 21:33:51 +0000] rev 28046
Merge
iveresov [Tue, 09 Dec 2014 12:25:38 -0800] rev 28045
8066900: Array Out Of Bounds Exception causes variable corruption
Summary: Fix FP registers save/restore during exception handling
Reviewed-by: kvn, vlivanov
roland [Tue, 09 Dec 2014 18:49:13 +0100] rev 28044
8066103: C2's range check smearing allows out of bound array accesses
Summary: range check smearing uncorrectly adjust first range check in a list of range checks to cover all of them
Reviewed-by: jrose, kvn, iveresov
iignatyev [Tue, 09 Dec 2014 14:49:27 +0000] rev 28043
Merge
iignatyev [Tue, 09 Dec 2014 17:31:40 +0300] rev 28042
8065134: Need WhiteBox::allocateCodeBlob(long, int) method to be implemented
Reviewed-by: kvn, dholmes, iignatyev
Contributed-by: tatiana.pivovarova@oracle.com
roland [Fri, 05 Dec 2014 18:03:15 +0100] rev 28041
8066775: opto/node.hpp:355, assert(i < _max) failed: oob: i=1, _max=1
Summary: bad assumption on graph shape in CastIINode::Value if that part of the graph is becoming dead.
Reviewed-by: kvn
iignatyev [Mon, 08 Dec 2014 18:21:02 +0300] rev 28040
8066250: compiler/dependencies/MonomorphicObjectCall/TestMonomorphicObjectCall.java fails product
Reviewed-by: kvn, thartmann
Contributed-by: tatiana.pivovarova@oracle.com
roland [Tue, 25 Nov 2014 17:33:59 +0100] rev 28039
6898462: The escape analysis with G1 cause crash assertion src/share/vm/runtime/vframeArray.cpp:94
Summary: OOM during reallocation of scalar replaced objects in deoptimization causes crashes
Reviewed-by: kvn, jrose
adlertz [Fri, 05 Dec 2014 15:16:01 +0100] rev 28038
Merge
roland [Thu, 04 Dec 2014 14:11:11 +0000] rev 28037
Merge
roland [Thu, 04 Dec 2014 14:34:11 +0100] rev 28036
8048170: Test closed/java/text/Normalizer/ConformanceTest.java failed
Summary: PhaseIdealLoop::split_if_with_blocks_post() shoulnd't reorder range checks adjusted by range check smearing
Reviewed-by: kvn, jrose
jwilhelm [Thu, 11 Dec 2014 20:39:25 +0100] rev 28035
Merge
jwilhelm [Thu, 11 Dec 2014 02:43:50 +0100] rev 28034
6522873: Java not print "Unrecognized option" when it is invalid option.
Summary: Introduced a new version of match_option() that don't allow a tail after the flag name and used it for flags without extra arguments
Reviewed-by: dholmes, dcubed
brutisso [Wed, 10 Dec 2014 11:32:22 +0100] rev 28033
8066782: Move common code from CMSGeneration and TenuredGeneration to CardGeneration
Reviewed-by: kbarrett, tschatzl
brutisso [Wed, 10 Dec 2014 11:31:43 +0100] rev 28032
8066781: Minor cleanups to TenuredGeneration
Reviewed-by: kbarrett, tschatzl
brutisso [Wed, 10 Dec 2014 11:30:46 +0100] rev 28031
8066780: Split CardGeneration out to its own file
Reviewed-by: kbarrett, tschatzl
tschatzl [Tue, 09 Dec 2014 12:47:19 +0100] rev 28030
8066102: Clean up HeapRegionRemSet files
Summary: Remove dead code, tighten public interfaces and improve documentation in the HeapRegionRemSet implementation.
Reviewed-by: mgerdin, kbarrett
jwilhelm [Mon, 08 Dec 2014 18:52:03 +0100] rev 28029
Merge
stefank [Mon, 08 Dec 2014 15:17:39 +0000] rev 28028
Merge
stefank [Fri, 05 Dec 2014 21:16:45 +0100] rev 28027
8065634: Crash in InstanceKlass::clean_method_data when _method is NULL
Reviewed-by: coleenp, hseigel, poonam
ehelin [Tue, 02 Dec 2014 09:53:30 +0100] rev 28026
8059066: CardTableModRefBS might commit the same page twice
Reviewed-by: tschatzl, kbarrett, jmasa
brutisso [Thu, 04 Dec 2014 09:43:12 +0000] rev 28025
Merge
sfriberg [Wed, 03 Dec 2014 09:27:24 -0800] rev 28024
8066441: Add PLAB trace event
Reviewed-by: tschatzl, ehelin, egahlin
minqi [Mon, 08 Dec 2014 00:15:55 -0800] rev 28023
Merge
mikael [Sat, 06 Dec 2014 04:30:00 +0000] rev 28022
Merge
cjplummer [Fri, 05 Dec 2014 15:41:51 -0800] rev 28021
8066508: JTReg tests timeout on slow devices when run using JPRT
Summary: Fixed by increasing timeoutFactor from 1 to 4 as is done already in jdk/test/Makefile.
Reviewed-by: dholmes, dcubed
coleenp [Fri, 05 Dec 2014 23:21:29 +0000] rev 28020
Merge
coleenp [Fri, 05 Dec 2014 15:15:13 -0500] rev 28019
8066171: Out of order with Metaspace allocation lock
Summary: Lock resolved_references instead.
Reviewed-by: twisti, sspitsyn
ccheung [Fri, 05 Dec 2014 12:24:10 -0800] rev 28018
8065050: vm crashes during CDS dump when very small SharedMiscDataSize is specified
Summary: define minimum required sizes for the ro, rw, and md regions and make sure the specified sizes are not less than the minimum sizes
Reviewed-by: jiangli, dholmes, mseledtsov
iklam [Thu, 04 Dec 2014 15:20:09 -0800] rev 28017
8066670: PrintSharedArchiveAndExit does not exit the VM when the archive is invalid
Summary: in FileMapInfo::fail_continue do not set UseSharedSpaces = false
Reviewed-by: dholmes, ccheung
kevinw [Thu, 04 Dec 2014 16:16:01 +0000] rev 28016
Merge
kevinw [Thu, 04 Dec 2014 12:43:45 +0000] rev 28015
8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java has utf8 character corrupted by earlier merge
Reviewed-by: sla, dsamersoff
mgronlun [Wed, 03 Dec 2014 17:12:25 +0100] rev 28014
8065788: os::reserve_memory() on Windows should not assert that allocation size is aligned to OS allocation granularity
Reviewed-by: mgronlun, simonis
Contributed-by: thomas.stuefe@sap.com
lana [Thu, 18 Dec 2014 19:57:49 -0800] rev 28013
Added tag jdk9-b43 for changeset c12e49897c5a
lana [Tue, 23 Dec 2014 13:56:51 -0800] rev 28012
Merge
mchung [Thu, 18 Dec 2014 13:56:46 -0800] rev 28011
8067898: Disable verify-modules until JDK-8067479 is resolved
Reviewed-by: ksrini
mchung [Wed, 17 Dec 2014 16:36:21 -0800] rev 28010
8067829: Remove setting -bootclasspath $(JDK_OUTPUTDIR)/classes from Javadoc.gmk
Reviewed-by: erikj
smarks [Mon, 15 Dec 2014 17:49:56 -0800] rev 28009
8067631: hgforest.sh mishandles arguments with spaces
Reviewed-by: chegar
ehelin [Tue, 16 Dec 2014 12:53:25 +0100] rev 28008
8067442: Tests using -Xshare:dump does not work with 'make test'
Reviewed-by: erikj, dholmes
alundblad [Tue, 16 Dec 2014 11:28:34 +0100] rev 28007
8066138: Trailing whitespace in title of javadoc: Overview (Java Platform SE 7 )
Summary: Trims whitespace of arguments in OptionOnly, OptionPair and OptionTrip.
Reviewed-by: erikj
joehw [Mon, 15 Dec 2014 13:09:39 -0800] rev 28006
8065673: XML Test Colo: Add test build system for JAXP tests
Reviewed-by: alanb, joehw
Contributed-by: tristan.yan@oracle.com
mchung [Mon, 15 Dec 2014 10:29:41 -0800] rev 28005
8067360: verify-modules target was dropped in jdk9 b41
Reviewed-by: alanb, erikj
sgehwolf [Fri, 12 Dec 2014 15:38:57 +0100] rev 28004
8067330: ZERO_ARCHDEF incorrectly defined for PPC/PPC64 architectures
Reviewed-by: simonis, tbell, erikj
erikj [Fri, 12 Dec 2014 15:33:10 +0100] rev 28003
8067254: No debug symbols in JPRT Windows builds
Reviewed-by: tbell
lana [Thu, 18 Dec 2014 19:57:47 -0800] rev 28002
Added tag jdk9-b43 for changeset 2d5bf96c8f17
duke [Wed, 05 Jul 2017 20:11:08 +0200] rev 28001
Added tag jdk9-b43 for changeset 6494b13f88a8
duke [Wed, 05 Jul 2017 20:11:08 +0200] rev 28000
Merge
duke [Wed, 05 Jul 2017 20:11:04 +0200] rev 27999
Merge
lana [Thu, 11 Dec 2014 12:26:42 -0800] rev 27998
Merge
aeremeev [Wed, 10 Dec 2014 21:45:39 +0200] rev 27997
8065360: Implement a test that checks possibilty of class members to be imported
Reviewed-by: jlahoda, anazarov
mcimadamore [Tue, 09 Dec 2014 17:40:02 +0000] rev 27996
8067006: Tweak IntelliJ langtools project to show jtreg report directory
Summary: Jtreg test output directory should be allowed to flow into IntelliJ's output
Reviewed-by: jlahoda
mcimadamore [Tue, 09 Dec 2014 16:09:07 +0000] rev 27995
8067001: DetectMutableStaticFields fails after modular images push
Summary: Ignore JRTIndex.sharedInstance
Reviewed-by: jlahoda
aeremeev [Tue, 09 Dec 2014 11:45:38 +0100] rev 27994
8066961: NegativeCyclicDependencyTest.java fails on Windows
Summary: Normalizing line endings to '\n'.
Reviewed-by: jlahoda
aeremeev [Tue, 09 Dec 2014 01:06:11 +0200] rev 27993
8064794: Implement negative tests for cyclic dependencies in import statements
Reviewed-by: jlahoda, anazarov
jlahoda [Mon, 08 Dec 2014 21:26:04 +0100] rev 27992
8066902: JavacParserTest fails on Windows
Summary: Normalizing line endings to '\n'.
Reviewed-by: jjg, ksrini
jlahoda [Mon, 08 Dec 2014 18:02:07 +0100] rev 27991
8061549: Disallow _ as a one-character identifier
Summary: Underscore is no longer a one-charater identifier with -source 9
Reviewed-by: mcimadamore, jjg
mcimadamore [Mon, 08 Dec 2014 16:30:43 +0000] rev 27990
8066889: IntelliJ langtools launcher ought to be Windows friendly
Summary: Fixup file and path separators in project setup stage.
Reviewed-by: jlahoda
jlahoda [Mon, 08 Dec 2014 11:50:19 +0100] rev 27989
8065753: javac crashing on a html-like file
Summary: Avoiding special-case in error recovery for bad token on position 0.
Reviewed-by: jjg
jjg [Thu, 04 Dec 2014 19:09:29 -0800] rev 27988
8066737: langtools/test/tools/javac/processing/6348193/T6348193.java fails
Reviewed-by: darcy
katleman [Thu, 11 Dec 2014 11:44:07 -0800] rev 27987
Added tag jdk9-b42 for changeset a48998a1fc72
duke [Wed, 05 Jul 2017 20:11:00 +0200] rev 27986
Merge
katleman [Thu, 11 Dec 2014 11:44:03 -0800] rev 27985
Added tag jdk9-b42 for changeset f65d79186283
duke [Wed, 05 Jul 2017 20:10:57 +0200] rev 27984
Merge
joehw [Thu, 11 Dec 2014 13:08:14 -0800] rev 27983
8051536: Convert JAXP function tests: javax.xml.parsers to jtreg(testng) tests
Reviewed-by: lancea, joehw
Contributed-by: frank.yuan@oracle.com
lana [Thu, 11 Dec 2014 12:27:55 -0800] rev 27982
Merge
joehw [Wed, 10 Dec 2014 16:38:01 -0800] rev 27981
8067183: TEST_BUG:File locked when processing the cleanup on test jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java
Reviewed-by: joehw
Contributed-by: tristan.yan@oracle.com
katleman [Thu, 11 Dec 2014 11:44:02 -0800] rev 27980
Added tag jdk9-b42 for changeset 0a96e0cdbae5
duke [Wed, 05 Jul 2017 20:10:53 +0200] rev 27979
Merge
lana [Thu, 11 Dec 2014 12:26:56 -0800] rev 27978
Merge
hannesw [Thu, 11 Dec 2014 19:15:47 +0100] rev 27977
8067219: NPE in ScriptObject.clone() when running with object fields
Reviewed-by: attila, lagergren
hannesw [Thu, 11 Dec 2014 15:39:58 +0100] rev 27976
8066669: dust.js performance regression caused by primitive field conversion
Reviewed-by: attila, sundar
hannesw [Thu, 11 Dec 2014 12:01:17 +0100] rev 27975
8066932: __noSuchMethod__ binds to this-object without proper guard
Reviewed-by: attila, lagergren
attila [Wed, 10 Dec 2014 18:28:41 +0100] rev 27974
8066221: anonymous function statement name clashes with another symbol
Reviewed-by: lagergren, sundar
sundar [Wed, 10 Dec 2014 19:42:01 +0530] rev 27973
8067136: BrowserJSObjectLinker does not handle call on JSObjects
Reviewed-by: attila, hannesw, lagergren
attila [Wed, 10 Dec 2014 12:30:48 +0100] rev 27972
8066236: RuntimeNode forces copy creation on visitation
Reviewed-by: hannesw, lagergren
attila [Wed, 10 Dec 2014 11:55:25 +0100] rev 27971
8066224: fixes for folding a constant-test ternary operator
Reviewed-by: hannesw, lagergren
attila [Wed, 10 Dec 2014 11:55:04 +0100] rev 27970
8066225: NPE in MethodEmitter with duplicate integer switch cases
Reviewed-by: hannesw, lagergren
attila [Mon, 08 Dec 2014 15:14:11 +0100] rev 27969
8066227: CodeGenerator load unitialized slot
Reviewed-by: hannesw, lagergren
attila [Mon, 08 Dec 2014 15:13:16 +0100] rev 27968
8066230: Undefined object type assertion when computing TypeBounds
Reviewed-by: hannesw, lagergren
sundar [Fri, 05 Dec 2014 20:17:51 +0530] rev 27967
8066777: OptimisticTypesPersistence.java should use Files.readAllBytes instead of getting size and then read
Reviewed-by: attila, lagergren
Contributed-by: paul.sandoz@oracle.com
sundar [Fri, 05 Dec 2014 19:01:26 +0530] rev 27966
8066753: OptimisticTypePersistence.java should work properly with "jrt" URL
Reviewed-by: lagergren, attila
sundar [Fri, 05 Dec 2014 14:35:00 +0530] rev 27965
8066749: jdk9-dev/nashorn ant build fails with jdk9 modular image build as JAVA_HOME
Reviewed-by: lagergren, hannesw
katleman [Thu, 11 Dec 2014 11:44:07 -0800] rev 27964
Added tag jdk9-b42 for changeset 5e4ae56d68ac
duke [Wed, 05 Jul 2017 20:10:48 +0200] rev 27963
Merge
katleman [Thu, 11 Dec 2014 11:44:00 -0800] rev 27962
Added tag jdk9-b42 for changeset b4926bbdbad8
duke [Wed, 05 Jul 2017 20:10:44 +0200] rev 27961
Merge
lana [Thu, 11 Dec 2014 12:27:27 -0800] rev 27960
Merge
dsamersoff [Thu, 11 Dec 2014 06:49:12 -0800] rev 27959
8067030: JDWP crash in transport_startTransport on OOM
Summary: Check for result of jvmtiAllocate
Reviewed-by: jbachorik, sspitsyn