amurillo [Thu, 13 Nov 2014 16:11:00 -0800] rev 27646
Merge
drchase [Thu, 13 Nov 2014 11:35:15 -0500] rev 27645
Merge
vlivanov [Tue, 11 Nov 2014 04:46:13 -0800] rev 27644
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
Reviewed-by: kvn, roland, coleenp, mgerdin
thartmann [Tue, 11 Nov 2014 11:05:41 +0100] rev 27643
8056071: compiler/whitebox/IsMethodCompilableTest.java fails with 'method() is not compilable after 3 iterations'
Summary: Always use MDO if valid and always compile trivial methods with C1 if available.
Reviewed-by: kvn, iveresov
iignatyev [Mon, 10 Nov 2014 19:04:38 +0300] rev 27642
8059624: Test task: WhiteBox API for testing segmented codecache feature
Reviewed-by: kvn, thartmann
iignatyev [Sat, 08 Nov 2014 16:00:28 +0300] rev 27641
8062742: compiler/EliminateAutoBox/UnsignedLoads.java fails with client vm
Reviewed-by: kvn, rbackman, anoll, vlivanov, iignatyev
Contributed-by: tatiana.pivovarova@oracle.com
iignatyev [Sat, 08 Nov 2014 16:00:27 +0300] rev 27640
8062011: JT_HS/compiler/7068051 uses jre/lib/javaws.jar
Reviewed-by: kvn, iignatyev
Contributed-by: tatiana.pivovarova@oracle.com
drchase [Fri, 07 Nov 2014 13:58:52 -0500] rev 27639
Merge
mdoerr [Wed, 05 Nov 2014 16:28:11 +0100] rev 27638
8062950: Bug in locking code when UseOptoBiasInlining is disabled: assert(dmw->is_neutral()) failed: invariant
Reviewed-by: dholmes, kvn
zmajo [Thu, 06 Nov 2014 09:40:58 +0100] rev 27637
8057622: java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest: SEGV inside compiled code (sparc)
Summary: In Parse::array_store_check(), add control edge FROM IfTrue branch of runtime type check of the destination array TO loading _element_klass from destination array.
Reviewed-by: kvn, roland, anoll
jwilhelm [Thu, 13 Nov 2014 12:29:09 +0100] rev 27636
Merge
kbarrett [Mon, 27 Oct 2014 17:24:10 -0400] rev 27635
8062206: Remove unusable G1RSLogCheckCardTable command line argument
Summary: Remove dependent assertion and remove develop option
Reviewed-by: jwilhelm, mgerdin, tschatzl
mlarsson [Mon, 10 Nov 2014 12:13:46 +0100] rev 27634
8064348: Add TraceEvent::is_enabled() for embedded/minimal builds
Reviewed-by: ehelin, sla
jcoomes [Fri, 07 Nov 2014 15:34:33 -0800] rev 27633
8060467: CMS: small OldPLABSize and -XX:-ResizePLAB cause assert(ResizePLAB || n_blks == OldPLABSize) failed: Error
Reviewed-by: tschatzl, jmasa, kbarrett
mgerdin [Mon, 03 Nov 2014 11:08:03 +0100] rev 27632
8061964: Insufficient compiler barriers for GCC in OrderAccess functions
Summary: Fix OrderAccess functions to emit memory clobbering inline assembly to attempt to stop copiler reordering.
Reviewed-by: dcubed, dholmes, bdelsart
jwilhelm [Wed, 05 Nov 2014 15:50:14 +0100] rev 27631
8062836: BACKOUT - Parallelize clearing the next mark bitmap
Summary: Backing out due to non-trivial issues found in nightly testing
Reviewed-by: mgerdin, mlarsson
ehelin [Wed, 05 Nov 2014 16:39:10 +0100] rev 27630
8061467: Bad page size passed to setup_large_pages() on Solaris
Reviewed-by: tschatzl, mgerdin
brutisso [Wed, 05 Nov 2014 10:12:51 +0100] rev 27629
8061449: G1: FreeRegionList_test() fails with G1 after the JDK-8058534 fix to HeapRegion::orig_end()
Reviewed-by: mgerdin, tschatzl, stefank
jwilhelm [Mon, 03 Nov 2014 15:53:48 +0100] rev 27628
Merge
mlarsson [Mon, 03 Nov 2014 12:49:21 +0100] rev 27627
8049341: Parallelize clearing the next mark bitmap
Reviewed-by: mgerdin, tschatzl
mlarsson [Mon, 03 Nov 2014 11:29:00 +0100] rev 27626
8054491: Remove wrong assert and refactor code in G1CollectorPolicy::record_concurrent_mark_end
Reviewed-by: tschatzl, brutisso
brutisso [Fri, 31 Oct 2014 09:10:51 +0100] rev 27625
8061308: Remove iCMS
Reviewed-by: mgerdin, jmasa
mlarsson [Thu, 30 Oct 2014 12:45:22 +0100] rev 27624
8043243: convert SCAN_AND_FORWARD, SCAN_AND_ADJUST_POINTERS, SCAN_AND_COMPACT macros to methods
Reviewed-by: mgerdin, kbarrett
sjohanss [Thu, 30 Oct 2014 10:51:06 +0100] rev 27623
8061234: ResourceContext.requestAccurateUpdate() is unreliable
Summary: Changing copy_allocation_context_stats to return if there are more stats available after the copy.
Reviewed-by: rriggs, jcoomes
sla [Thu, 13 Nov 2014 07:58:28 +0100] rev 27622
Merge
jiangli [Tue, 11 Nov 2014 19:42:52 +0000] rev 27621
Merge
jiangli [Tue, 11 Nov 2014 16:54:24 +0000] rev 27620
Merge
jiangli [Mon, 10 Nov 2014 19:52:28 -0500] rev 27619
Merge
jiangli [Mon, 10 Nov 2014 19:28:51 -0500] rev 27618
8064375: Change certain errors to warnings in CDS output.
Summary: Change CDS non-fatal preloading errors to warnings.
Reviewed-by: minqi, mseledtsov, coleenp
coleenp [Tue, 11 Nov 2014 18:00:06 +0000] rev 27617
Merge
shade [Tue, 11 Nov 2014 15:07:09 +0300] rev 27616
8015272: Make @Contended within the same group to use the same oop map
Reviewed-by: coleenp, dholmes
coleenp [Tue, 11 Nov 2014 09:59:50 -0500] rev 27615
8062870: src/share/vm/services/mallocTracker.hpp:64 assert(_count > 0) failed: Negative counter
Summary: Signed bitfield size y can only have (1 << y)-1 values.
Reviewed-by: shade, dholmes, jrose, ctornqvi, gtriantafill
dsamersoff [Tue, 11 Nov 2014 04:34:56 -0800] rev 27614
8059131: sawindbg.dll is not compiled with /SAFESEH
Summary: Make variable SAFESEH_FLAG replaced with /SAFESEH link option.
Reviewed-by: mgronlun, sla
emc [Mon, 10 Nov 2014 19:37:32 -0500] rev 27613
8058322: Zero name_index item of MethodParameters attribute cause MalformedParameterException
Summary: Allow hotspot to report null for 0 parameter_name index in MethodParameters attribute
Reviewed-by: coleenp, dholmes
emc [Mon, 10 Nov 2014 16:45:46 -0500] rev 27612
8058313: Mismatch of method descriptor and MethodParameters.parameters_count should cause MalformedParameterException
Summary: Allow hotspot to store and report zero-length MethodParameters attribute data
Reviewed-by: coleenp, jiangli
ccheung [Mon, 10 Nov 2014 10:13:10 -0800] rev 27611
8060721: Test runtime/SharedArchiveFile/LimitSharedSizes.java fails in jdk 9 fcs new platforms/compiler
Summary: replaced strcat() with jio_snprintf()
Reviewed-by: dholmes, iklam, dlong, minqi
minqi [Fri, 07 Nov 2014 12:48:09 -0800] rev 27610
8062247: [TESTBUG] Allow WhiteBox test to access JVM offsets
Reviewed-by: coleenp, iklam, mseledtsov
Contributed-by: yumin.qi@oracle.com
sla [Fri, 07 Nov 2014 13:50:55 +0100] rev 27609
Merge
dcubed [Thu, 06 Nov 2014 13:05:14 -0800] rev 27608
8062851: cleanup ObjectMonitor offset adjustments
Summary: JEP-143/JDK-8046133 - cleanup computation of ObjectMonitor field pointers
Reviewed-by: dholmes, redestad, coleenp
lana [Thu, 20 Nov 2014 10:57:38 -0800] rev 27607
Merge
azakharov [Wed, 19 Nov 2014 19:22:49 +0400] rev 27606
8059661: Test SoftReference and OOM behavior
Reviewed-by: tschatzl
azakharov [Fri, 14 Nov 2014 17:36:56 +0400] rev 27605
8064716: TestHumongousShrinkHeap.java can not be run with -XX:+ExplicitGCInvokesConcurrent
8062957: Heap is not shrunk when deallocating under memory pressure
Summary: Added explicit -XX:-ExplicitGCInvokesConcurrent to invocations
Reviewed-by: brutisso, tschatzl
katleman [Thu, 04 Dec 2014 12:58:13 -0800] rev 27604
Added tag jdk9-b41 for changeset 47f369e3c69c
lana [Thu, 04 Dec 2014 15:21:09 -0800] rev 27603
Merge
chegar [Wed, 03 Dec 2014 19:28:30 +0000] rev 27602
Merge
amurillo [Tue, 02 Dec 2014 14:36:22 -0800] rev 27601
Merge
amurillo [Thu, 27 Nov 2014 07:16:53 -0800] rev 27600
Merge
sla [Mon, 24 Nov 2014 09:57:02 +0100] rev 27599
Merge
sla [Mon, 17 Nov 2014 09:36:40 +0100] rev 27598
Merge
miauno [Fri, 14 Nov 2014 10:29:01 +0100] rev 27597
8064799: [TESTBUG] JT-Reg Serviceability tests to be run as part of JPRT submit job
Reviewed-by: sla, alanb, dholmes, sspitsyn
sundar [Fri, 28 Nov 2014 18:31:05 +0530] rev 27596
8066146: jdk.nashorn.api.scripting package javadoc should be included in jdk docs
Reviewed-by: erikj, jlaskey, lagergren
ihse [Thu, 27 Nov 2014 15:41:56 +0100] rev 27595
8065914: Various improvements and cleanup of build system
Reviewed-by: erikj
ehelin [Mon, 24 Nov 2014 14:44:10 +0100] rev 27594
8065648: Remove the flag -fsanitize=undefined for GCC 4.9 and later
Reviewed-by: erikj
ihse [Wed, 26 Nov 2014 15:14:14 +0100] rev 27593
8065913: Various improvements in SetupNativeCompilation
Reviewed-by: erikj
ihse [Wed, 26 Nov 2014 14:59:10 +0100] rev 27592
8065911: Introduce EvalDebugWrapper for all Setup* macros
Reviewed-by: erikj
erikj [Mon, 24 Nov 2014 11:53:47 +0100] rev 27591
8065138: Encodings.isRecognizedEnconding sometimes fails to recognize 'UTF8'
Reviewed-by: dfuchs
amurillo [Fri, 21 Nov 2014 08:00:30 -0800] rev 27590
Merge
amurillo [Thu, 13 Nov 2014 16:11:00 -0800] rev 27589
Merge
iignatyev [Sat, 08 Nov 2014 16:01:10 +0300] rev 27588
8063157: add targets for optimized builds
Reviewed-by: kvn, dholmes
ihse [Fri, 21 Nov 2014 16:11:28 +0100] rev 27587
8065215: Print warning summary at end of configure
Reviewed-by: erikj, tbell
ihse [Fri, 21 Nov 2014 16:05:46 +0100] rev 27586
8058631: Rename posix to unix in build system to match file name changes
Reviewed-by: simonis, erikj, tbell
lana [Thu, 20 Nov 2014 10:57:11 -0800] rev 27585
Merge
erikj [Tue, 18 Nov 2014 16:07:57 +0100] rev 27584
8065183: Add --with-copyright-year option to configure
Reviewed-by: ihse, tbell
katleman [Thu, 04 Dec 2014 12:58:11 -0800] rev 27583
Added tag jdk9-b41 for changeset adc258b13e2c
duke [Wed, 05 Jul 2017 20:08:43 +0200] rev 27582
Added tag jdk9-b41 for changeset 9fffb959eb41
duke [Wed, 05 Jul 2017 20:08:43 +0200] rev 27581
Merge
duke [Wed, 05 Jul 2017 20:08:38 +0200] rev 27580
Merge
chegar [Wed, 03 Dec 2014 14:25:46 +0000] rev 27579
8049367: Modular Run-Time Images
Reviewed-by: jlahoda, ksrini
Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, bradford.wetmore@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, james.laskey@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com, sundararajan.athijegannathan@oracle.com
katleman [Tue, 18 Nov 2014 15:25:18 -0800] rev 27578
Added tag jdk9-b40 for changeset 5152f73fa93b
duke [Wed, 05 Jul 2017 20:08:34 +0200] rev 27577
Merge
katleman [Tue, 18 Nov 2014 15:25:16 -0800] rev 27576
Added tag jdk9-b40 for changeset b31dbb20135a
duke [Wed, 05 Jul 2017 20:08:31 +0200] rev 27575
Merge
chegar [Wed, 03 Dec 2014 14:22:17 +0000] rev 27574
8049367: Modular Run-Time Images
Reviewed-by: chegar, dfuchs, ihse, joehw, mullan, psandoz, wetmore
Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, bradford.wetmore@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, james.laskey@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com, sundararajan.athijegannathan@oracle.com
katleman [Tue, 18 Nov 2014 15:25:15 -0800] rev 27573
Added tag jdk9-b40 for changeset de21c9802939
duke [Wed, 05 Jul 2017 20:08:27 +0200] rev 27572
Merge
chegar [Wed, 03 Dec 2014 14:26:07 +0000] rev 27571
8049367: Modular Run-Time Images
Reviewed-by: chegar, dfuchs, ihse, joehw, mullan, psandoz, wetmore
Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, bradford.wetmore@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, james.laskey@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com, sundararajan.athijegannathan@oracle.com
katleman [Tue, 18 Nov 2014 15:25:19 -0800] rev 27570
Added tag jdk9-b40 for changeset 4bb9d8815020
duke [Wed, 05 Jul 2017 20:08:21 +0200] rev 27569
Merge
chegar [Wed, 03 Dec 2014 14:20:24 +0000] rev 27568
8049367: Modular Run-Time Images
Reviewed-by: chegar, dfuchs, ihse, joehw, mullan, psandoz, wetmore
Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, bradford.wetmore@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, james.laskey@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com, sundararajan.athijegannathan@oracle.com
katleman [Tue, 18 Nov 2014 15:25:14 -0800] rev 27567
Added tag jdk9-b40 for changeset 11359380f4f9
duke [Wed, 05 Jul 2017 20:08:17 +0200] rev 27566
Merge
chegar [Wed, 03 Dec 2014 14:22:58 +0000] rev 27565
8049367: Modular Run-Time Images
Reviewed-by: chegar, dfuchs, ihse, joehw, mullan, psandoz, wetmore
Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, bradford.wetmore@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, james.laskey@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com, sundararajan.athijegannathan@oracle.com
katleman [Tue, 18 Nov 2014 15:25:16 -0800] rev 27564
Added tag jdk9-b40 for changeset d480c3085030
duke [Wed, 05 Jul 2017 20:08:11 +0200] rev 27563
Merge
chegar [Wed, 03 Dec 2014 14:21:14 +0000] rev 27562
8049367: Modular Run-Time Images
Reviewed-by: chegar, dfuchs, ihse, joehw, mullan, psandoz, wetmore
Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, bradford.wetmore@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, james.laskey@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com, sundararajan.athijegannathan@oracle.com
katleman [Tue, 18 Nov 2014 15:25:14 -0800] rev 27561
Added tag jdk9-b40 for changeset e549997f615f
chegar [Wed, 03 Dec 2014 14:20:21 +0000] rev 27560
8049367: Modular Run-Time Images
Reviewed-by: chegar, dfuchs, ihse, joehw, mullan, psandoz, wetmore
Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, bradford.wetmore@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, james.laskey@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com, sundararajan.athijegannathan@oracle.com
katleman [Tue, 18 Nov 2014 15:25:13 -0800] rev 27559
Added tag jdk9-b40 for changeset e49b8c74a1c0
duke [Wed, 05 Jul 2017 20:07:56 +0200] rev 27558
Added tag jdk9-b40 for changeset 82f4cb44b2d7
duke [Wed, 05 Jul 2017 20:07:55 +0200] rev 27557
Merge
duke [Wed, 05 Jul 2017 20:07:51 +0200] rev 27556
Merge
lana [Thu, 13 Nov 2014 09:39:52 -0800] rev 27555
Merge
alundblad [Thu, 13 Nov 2014 14:49:02 +0100] rev 27554
8059591: Give TaskListener methods empty default implementations
Summary: Added empty default implementations for TaskListener methods.
Reviewed-by: jfranck, ohrstrom
jlahoda [Wed, 12 Nov 2014 19:05:17 +0100] rev 27553
8064362: WriteableScope.dupUnshared misbehaves on shared Scopes
Summary: When calling dupUnshared on a shared scope, make sure the result does not contain Symbols that don't belong to the scope that is being dupUnshared.
Reviewed-by: mcimadamore
aeremeev [Wed, 12 Nov 2014 15:16:35 +0200] rev 27552
8042931: Implement classfile tests for EnclosingMethod attribute.
Reviewed-by: jjg, shurailine, anazarov
mcimadamore [Wed, 12 Nov 2014 12:41:32 +0000] rev 27551
8064464: regression with type inference of conditional expression
Summary: Bad classification of conditional leads to spurious error
Reviewed-by: jlahoda
alundblad [Mon, 10 Nov 2014 20:29:58 +0100] rev 27550
8062737: Sjavac creates unnecessarily many SjavacClient/PooledSjavac/SjavacImpl instances
Summary: Moved sjavac initialization out of loop body.
Reviewed-by: jfranck, ohrstrom
jfranck [Fri, 24 Oct 2014 10:08:51 +0200] rev 27549
8060448: ArrayIndexOutOfBoundsException with annotation processing printout of empty line
Reviewed-by: jlahoda
mcimadamore [Sat, 08 Nov 2014 22:00:31 +0000] rev 27548
8064367: Fix IntelliJ langtools support to use new dev build
Summary: Update ant hooks in langtools IntelliJ project
Reviewed-by: jlahoda
jjg [Fri, 07 Nov 2014 14:51:35 -0800] rev 27547
8063145: ToolBox should support extracting classes from a JavaFileManager/Location
Reviewed-by: ksrini
jlahoda [Fri, 07 Nov 2014 18:22:36 +0100] rev 27546
8058489: More adjustments of langtools/make/build.xml to modularized layout
Summary: Re-structuring the langtools/make/build.xml to reflect the modular layout, cleanup of the build script
Reviewed-by: jjg, mcimadamore, ksrini
emc [Fri, 07 Nov 2014 07:54:35 -0500] rev 27545
8029012: parameter_index for type annotation not updated after outer.this added
Summary: Fix javac's handling of type annotations when synthetic parameters are added
Reviewed-by: jjg, mcimadamore
emc [Thu, 06 Nov 2014 17:39:57 -0500] rev 27544
8062245: Test executes incorrect class
Summary: Fix issue with test executing incorrect class, and trivial test failure linked to different subclasses of CharSequance.
Reviewed-by: jjg
katleman [Wed, 12 Nov 2014 20:32:27 -0800] rev 27543
Added tag jdk9-b39 for changeset b2343bf3a5d8
duke [Wed, 05 Jul 2017 20:07:46 +0200] rev 27542
Merge
katleman [Wed, 12 Nov 2014 20:32:25 -0800] rev 27541
Added tag jdk9-b39 for changeset eafa8898e1a0
duke [Wed, 05 Jul 2017 20:07:41 +0200] rev 27540
Merge
lana [Thu, 13 Nov 2014 09:39:08 -0800] rev 27539
Merge
joehw [Tue, 11 Nov 2014 14:27:13 -0800] rev 27538
8047962: XML test colocation: AuctionPortal test
Reviewed-by: joehw
Contributed-by: tristan.yan@oracle.com
dbuck [Mon, 10 Nov 2014 16:09:38 -0800] rev 27537
8064516: BCEL still corrupts generic methods if bytecode offsets are modified
Summary: Added comprehensive support for LocalVariableTypeTable to MethodGen.
Reviewed-by: joehw
joehw [Fri, 07 Nov 2014 13:18:58 -0800] rev 27536
8059327: XML parser returns corrupt attribute value
Reviewed-by: lancea
dbuck [Thu, 06 Nov 2014 23:14:02 -0800] rev 27535
8062608: BCEL corrupts debug data of methods that use generics
Summary: Fixed MethodGen constructor to not overwrite LocalVariableTable.
Reviewed-by: joehw
katleman [Wed, 12 Nov 2014 20:32:24 -0800] rev 27534
Added tag jdk9-b39 for changeset b2746ec1c520
duke [Wed, 05 Jul 2017 20:07:38 +0200] rev 27533
Merge
lana [Thu, 13 Nov 2014 09:38:35 -0800] rev 27532
Merge
lagergren [Thu, 13 Nov 2014 16:59:03 +0100] rev 27531
8062937: Need to block constant assumption for index setters and defineOwnProperty, not just delete
Reviewed-by: hannesw, jlaskey
hannesw [Thu, 13 Nov 2014 15:29:22 +0100] rev 27530
8064789: Nashorn should just warn on code store instantiation error
Reviewed-by: attila, lagergren
lagergren [Wed, 12 Nov 2014 17:19:04 +0100] rev 27529
8063036: Various pretty printing issues with --log=recompile
Reviewed-by: hannesw, jlaskey
attila [Wed, 12 Nov 2014 15:13:08 +0100] rev 27528
8064707: Remove NativeArray link logic fields
Reviewed-by: hannesw, lagergren
attila [Wed, 12 Nov 2014 14:54:40 +0100] rev 27527
8063037: ApplySpecialization.hasApplies shouuld not descend into nested functions
Reviewed-by: hannesw, lagergren