duke [Wed, 05 Jul 2017 20:00:48 +0200] rev 26521
Merge
lana [Thu, 11 Sep 2014 14:28:19 -0700] rev 26520
Merge
wetmore [Thu, 11 Sep 2014 12:17:59 -0700] rev 26519
8058180: .hgignore should be updated with webrev in all repos
Reviewed-by: jrose, katleman, jjg
lana [Wed, 10 Sep 2014 19:38:08 -0700] rev 26518
Merge
martin [Wed, 10 Sep 2014 15:17:48 -0700] rev 26517
8058175: [XML 1.0/1.1] - Attribute values with supplemental characters are being corrupted.
Reviewed-by: joehw
joehw [Fri, 05 Sep 2014 14:04:22 -0700] rev 26516
8056202: Xerces Update: Catalog Resolver
Reviewed-by: lancea
katleman [Thu, 11 Sep 2014 09:08:51 -0700] rev 26515
Added tag jdk9-b30 for changeset bbce32388a2d
duke [Wed, 05 Jul 2017 20:00:43 +0200] rev 26514
Merge
lana [Thu, 11 Sep 2014 14:30:00 -0700] rev 26513
Merge
wetmore [Thu, 11 Sep 2014 12:18:02 -0700] rev 26512
8058180: .hgignore should be updated with webrev in all repos
Reviewed-by: jrose, katleman, jjg
hannesw [Thu, 11 Sep 2014 17:23:02 +0200] rev 26511
8058179: Global constants get in the way of self-modifying properties
Reviewed-by: attila, jlaskey, sundar, lagergren
attila [Thu, 11 Sep 2014 17:12:38 +0200] rev 26510
8058100: Reduce the RecompilableScriptFunctionData footprint
Reviewed-by: jlaskey, lagergren
lana [Wed, 10 Sep 2014 19:37:52 -0700] rev 26509
Merge
hannesw [Wed, 10 Sep 2014 15:19:26 +0200] rev 26508
8057021: UserAccessorProperty guards fail with multiple globals
Reviewed-by: attila, lagergren
attila [Wed, 10 Sep 2014 13:08:58 +0200] rev 26507
8034954: Optimistic iteration in for-in and for-each
Reviewed-by: hannesw, lagergren
lagergren [Wed, 10 Sep 2014 12:37:44 +0200] rev 26506
8057703: More empty classes generated by Nashorn
Reviewed-by: attila, sundar
attila [Tue, 09 Sep 2014 15:34:14 +0200] rev 26505
8057931: Instead of not skipping small functions in parser, make lexer avoid them instead
Reviewed-by: hannesw, sundar
attila [Tue, 09 Sep 2014 15:33:58 +0200] rev 26504
8057930: remove eval ID
Reviewed-by: hannesw, sundar
attila [Mon, 08 Sep 2014 18:40:58 +0200] rev 26503
8057148: Skip nested functions on reparse
Reviewed-by: hannesw, lagergren
yan [Mon, 08 Sep 2014 15:37:50 +0400] rev 26502
8057678: Tests for let and const keywords in Nashorn
Reviewed-by: hannesw, lagergren
Contributed-by: Sergey Lugovoy <sergey.lugovoy@oracle.com>
sundar [Mon, 08 Sep 2014 15:51:27 +0530] rev 26501
8057742: ant clean test should not fail if one or more external test suites are missing
Reviewed-by: lagergren, hannesw
lagergren [Fri, 05 Sep 2014 16:28:17 +0200] rev 26500
8057588: Lots of trivial (empty) classes were generated by the Nashorn compiler as part of restOf-method generation
Reviewed-by: attila, sundar, hannesw
lagergren [Fri, 05 Sep 2014 16:28:02 +0200] rev 26499
8057611: Nashorn did not dump the JOx classes to disk when running with the -d flag
Reviewed-by: attila, sundar, hannesw
katleman [Thu, 11 Sep 2014 09:09:02 -0700] rev 26498
Added tag jdk9-b30 for changeset 00bb2442d1d6
duke [Wed, 05 Jul 2017 20:00:37 +0200] rev 26497
Merge
lana [Thu, 11 Sep 2014 14:28:13 -0700] rev 26496
Merge
wetmore [Thu, 11 Sep 2014 12:17:58 -0700] rev 26495
8058180: .hgignore should be updated with webrev in all repos
Reviewed-by: jrose, katleman, jjg
katleman [Thu, 11 Sep 2014 09:08:40 -0700] rev 26494
Added tag jdk9-b30 for changeset 10aa2df75c46
duke [Wed, 05 Jul 2017 20:00:32 +0200] rev 26493
Merge
lana [Thu, 11 Sep 2014 14:29:21 -0700] rev 26492
Merge
lancea [Thu, 11 Sep 2014 17:00:08 -0400] rev 26491
8057826: Minor clean-up to the java.sql Date/Time/Timestamp tests
Reviewed-by: redestad, joehw
wetmore [Thu, 11 Sep 2014 12:18:06 -0700] rev 26490
8058180: .hgignore should be updated with webrev in all repos
Reviewed-by: jrose, katleman, jjg
valeriep [Thu, 11 Sep 2014 17:06:35 +0000] rev 26489
8039898: sunpkcs11-solaris.cfg should be in solaris specific directory
Summary: Move from src/java.base/share/conf/security/ to src/jdk.crypto.pkcs11/solaris/conf/security
Reviewed-by: erikj, ihse
dsamersoff [Thu, 11 Sep 2014 08:01:33 -0700] rev 26488
8057746: Cannot handle JdpException in JMX agent initialization.
Summary: Add special handling for JdpException
Reviewed-by: jbachorik
Contributed-by: Yasumasa Suenaga <yasuenag@gmail.com>
michaelm [Thu, 11 Sep 2014 15:51:46 +0100] rev 26487
8057936: java.net.URLClassLoader.findClass uses exceptions in control flow
Reviewed-by: alanb, chegar, dholmes, mr
Contributed-by: claes.redestad@oracle.com
dsamersoff [Thu, 11 Sep 2014 06:21:10 -0700] rev 26486
8057556: JDP should better handle non-active interfaces
Summary: skip interface if it's not up or doesn't have IP address
Reviewed-by: jbachorik
Contributed-by: Yasumasa Suenaga <yasuenag@gmail.com>
aefimov [Thu, 11 Sep 2014 15:13:37 +0400] rev 26485
8057747: Several test failing after update to tzdata2014g
Reviewed-by: alanb
jbachorik [Thu, 11 Sep 2014 12:54:02 +0200] rev 26484
8058089: api/javax_management/loading/MLetArgsSupport.html\#MLetArgsSupportTest0001 fails because of java.lang.IllegalArgumentException (argument type mismatch)
Reviewed-by: dfuchs
lana [Wed, 10 Sep 2014 19:37:23 -0700] rev 26483
Merge
vlivanov [Wed, 10 Sep 2014 19:19:52 +0400] rev 26482
8057922: Improve LambdaForm sharing by using LambdaFormEditor more extensively
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:52 +0400] rev 26481
8057042: LambdaFormEditor: derive new LFs from a base LF
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:52 +0400] rev 26480
8056926: Improve caching of GuardWithTest combinator
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:51 +0400] rev 26479
8057657: Annotate LambdaForm parameters with types
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:51 +0400] rev 26478
8057656: Improve MethodType.isCastableTo() & MethodType.isConvertibleTo() checks
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:51 +0400] rev 26477
8057654: Extract checks performed during MethodHandle construction into separate methods
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:50 +0400] rev 26476
8050887: Intrinsify constants for default values
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:50 +0400] rev 26475
8050884: Intrinsify ValueConversions.identity() functions
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:50 +0400] rev 26474
8050877: Improve code for pairwise argument conversions and value boxing/unboxing
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:50 +0400] rev 26473
8050200: Make LambdaForm intrinsics detection more robust
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:49 +0400] rev 26472
8050057: Improve caching of MethodHandle reinvokers
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:49 +0400] rev 26471
8050174: Support overriding of isInvokeSpecial flag in WrappedMember
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:49 +0400] rev 26470
8050173: Add j.l.i.MethodHandle.copyWith(MethodType, LambdaForm)
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:48 +0400] rev 26469
8050166: Get rid of some package-private methods on arguments in j.l.i.MethodHandle
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:48 +0400] rev 26468
8050053: Improve caching of different invokers
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:47 +0400] rev 26467
8050052: Small cleanups in java.lang.invoke code
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:47 +0400] rev 26466
8049555: Move varargsArray from sun.invoke.util package to java.lang.invoke
Reviewed-by: psandoz, iignatyev
vlivanov [Wed, 10 Sep 2014 19:19:47 +0400] rev 26465
8038261: JSR292: cache and reuse typed array accessors
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
vlivanov [Wed, 10 Sep 2014 19:19:46 +0400] rev 26464
8037209: Improvements and cleanups to bytecode assembly for lambda forms
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
coffeys [Wed, 10 Sep 2014 16:14:14 +0100] rev 26463
8057813: Alterations to jdk_security3 test target
Reviewed-by: mullan, wetmore, xuelei
alanb [Wed, 10 Sep 2014 13:51:17 +0100] rev 26462
8055251: Re-examine Integer.parseInt and Long.parseLong methods
Reviewed-by: alanb
Contributed-by: claes.redestad@oracle.com
sla [Wed, 10 Sep 2014 10:37:12 +0200] rev 26461
8057937: javax/management/monitor/GaugeMonitorDeadlockTest.java should be quarantined
Reviewed-by: sla, allwin
sla [Wed, 10 Sep 2014 11:32:31 +0200] rev 26460
8057558: VirtualMachineImpl.execute on windows should close PipedInputStream before throwing exceptions
Reviewed-by: alanb, sspitsyn, dsamersoff
stefank [Thu, 04 Sep 2014 13:20:27 +0200] rev 26459
8057174: MemoryMXBean tests -- TEST FAILED: chunkSize: 6291456 is less than YOUNG_GEN_SIZE: 8388608
Reviewed-by: jbachorik, jwilhelm, dfuchs
igerasim [Tue, 09 Sep 2014 19:02:36 +0400] rev 26458
7010989: Duplicate closure of file descriptors leads to unexpected and incorrect closure of sockets
Reviewed-by: chegar
kizune [Tue, 09 Sep 2014 17:20:26 +0400] rev 26457
8051989: Unportable format string argument mismatch in jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
Reviewed-by: ksrini
jfranck [Tue, 09 Sep 2014 12:04:31 +0200] rev 26456
5043030: (reflect) unnecessary object creation in reflection
Summary: Use valueOf() instead of new for primitive wrappers.
Reviewed-by: jfranck
Contributed-by: Andrej Golovnin <andrej.golovnin@gmail.com>
jfranck [Tue, 09 Sep 2014 10:48:01 +0200] rev 26455
8054987: (reflect) Add sharing of annotations between instances of Executable
Reviewed-by: darcy, plevart
sla [Mon, 08 Sep 2014 20:29:15 +0200] rev 26454
8057778: Misc cleanups of the attach code (aix)
Reviewed-by: simonis
sla [Mon, 08 Sep 2014 14:46:51 +0200] rev 26453
8057776: Misc cleanups of the attach code
Reviewed-by: alanb, dfuchs, jbachorik
aefimov [Sun, 07 Sep 2014 23:04:09 +0400] rev 26452
8049343: (tz) Support tzdata2014g
Reviewed-by: mfang, okutsu
martin [Fri, 29 Aug 2014 14:50:15 -0700] rev 26451
8056951: pico-optimize contains(Object) methods
Summary: use idiiom >= 0 consistently to check for valid index
Reviewed-by: mduigou
ykantser [Fri, 05 Sep 2014 15:09:05 +0200] rev 26450
8057686: Clean up ProblemList.txt
Reviewed-by: jbachorik
alanb [Fri, 05 Sep 2014 12:18:31 +0100] rev 26449
8029516: (fs) WatchKey cancel unreliable on Windows
Reviewed-by: chegar
dl [Fri, 05 Sep 2014 10:54:28 +0200] rev 26448
8056248: Improve ForkJoin thread throttling
Reviewed-by: psandoz, martin
katleman [Thu, 11 Sep 2014 09:08:56 -0700] rev 26447
Added tag jdk9-b30 for changeset dfdf7c92f55e
duke [Wed, 05 Jul 2017 20:00:24 +0200] rev 26446
Merge
lana [Thu, 11 Sep 2014 14:28:30 -0700] rev 26445
Merge
wetmore [Thu, 11 Sep 2014 12:18:02 -0700] rev 26444
8058180: .hgignore should be updated with webrev in all repos
Reviewed-by: jrose, katleman, jjg
lana [Wed, 10 Sep 2014 19:36:46 -0700] rev 26443
Merge
kvn [Thu, 04 Sep 2014 22:59:17 -0700] rev 26442
Merge
simonis [Wed, 03 Sep 2014 14:39:13 +0200] rev 26441
8057129: Fix AIX build after the Extend CompileCommand=option change 8055286
Reviewed-by: kvn
roland [Sat, 02 Aug 2014 06:15:23 +0200] rev 26440
8057038: Speculative traps not robust when compilation and class unloading are concurrent
Summary: speculative traps can be removed from MDO while being copied by compiler
Reviewed-by: kvn, iveresov
fzhinkin [Wed, 03 Sep 2014 15:29:57 +0400] rev 26439
8055904: Develop tests for new command-line options related to SHA intrinsics
Reviewed-by: kvn, iignatyev
fzhinkin [Wed, 03 Sep 2014 15:26:06 +0400] rev 26438
8055903: Develop sanity tests on SPARC's SHA instructions support
Reviewed-by: kvn, iignatyev
fzhinkin [Wed, 03 Sep 2014 15:24:26 +0400] rev 26437
8056091: Move compiler/intrinsics/mathexact/sanity/Verifier to compiler/testlibrary and extend its functionality
Reviewed-by: kvn, iignatyev
roland [Wed, 27 Aug 2014 17:37:18 +0200] rev 26436
8055946: assert(result == NULL || result->is_oop()) failed: must be oop
Summary: caller of popped frame doesn't have valid result during deoptimization
Reviewed-by: kvn
roland [Fri, 29 Aug 2014 16:32:29 +0200] rev 26435
8055910: closed/java/util/Collections/CheckedCollections.java failed with ClassCastException not thrown
Summary: missing subtype check for Arrays.copyOf intrinsic
Reviewed-by: kvn, iveresov
kvn [Tue, 02 Sep 2014 12:48:45 -0700] rev 26434
8055494: Add C2 x86 intrinsic for BigInteger::multiplyToLen() method
Summary: Add new C2 intrinsic for BigInteger::multiplyToLen() on x86 in 64-bit VM.
Reviewed-by: roland
kvn [Tue, 02 Sep 2014 10:26:48 -0700] rev 26433
8056964: JDK-8055286 changes are incomplete.
Summary: added ccstr and ccstrlist types to compilerOracle 'option' command
Reviewed-by: roland
drchase [Fri, 29 Aug 2014 19:45:49 -0400] rev 26432
8054292: code comments leak in fastdebug builds
Summary: Added deallocation to destructor; hardened interface against misuse
Reviewed-by: kvn
thartmann [Fri, 29 Aug 2014 13:46:50 +0000] rev 26431
Merge
zmajo [Fri, 29 Aug 2014 15:32:16 +0200] rev 26430
8055286: Extend CompileCommand=option to handle numeric parameters
Summary: Changed CompileCommand=option to handle "extended" parameters: Klass::method,type,flag,value. Types supported are bool, intx, and uintx.
Reviewed-by: kvn, roland
thartmann [Fri, 29 Aug 2014 14:46:35 +0200] rev 26429
8056067: NodeHash debug variables are available in product build
Summary: Make NodeHash debug variables only available in debug/optimized build.
Reviewed-by: kvn, roland
iignatyev [Thu, 28 Aug 2014 23:30:13 +0400] rev 26428
8056223: typo in export_optimized_jdk
Reviewed-by: kvn
jmasa [Thu, 04 Sep 2014 13:45:39 -0700] rev 26427
Merge
jmasa [Thu, 04 Sep 2014 12:25:05 -0700] rev 26426
Merge
tschatzl [Wed, 03 Sep 2014 15:07:47 +0000] rev 26425
Merge
tschatzl [Wed, 03 Sep 2014 17:01:57 +0200] rev 26424
8057143: Incomplete renaming of variables containing "hrs" to "hrm" related to HeapRegionSeq
Summary: Fixup the remaining variable names.
Reviewed-by: tonyp, jwilhelm
stefank [Wed, 03 Sep 2014 12:45:14 +0200] rev 26423
8057037: Verification in ClassLoaderData::is_alive is too slow
Reviewed-by: brutisso, mgerdin, tschatzl
mgerdin [Fri, 29 Aug 2014 13:12:21 +0200] rev 26422
8048268: G1 Code Root Migration performs poorly
Summary: Replace G1CodeRootSet with a Hashtable based implementation, merge Code Root Migration phase into Code Root Scanning
Reviewed-by: jmasa, brutisso, tschatzl
mgerdin [Fri, 29 Aug 2014 13:08:01 +0200] rev 26421
8056084: Refactor Hashtable to allow implementations without rehashing support
Reviewed-by: gziemski, jmasa, brutisso, coleenp, tschatzl
ctornqvi [Wed, 03 Sep 2014 17:30:23 -0400] rev 26420
8057147: [TESTBUG] Platform.isDebugBuild() doesn't work on all build types
Summary: Check java.version for debug string as well
Reviewed-by: gtriantafill, hseigel, sla, acorn, dcubed
iklam [Tue, 02 Sep 2014 09:51:24 -0700] rev 26419
8056971: Minor class loading clean-up
Summary: Misplacement of #if INCLUE_CDS, typos, unnecessary C string duplication
Reviewed-by: dholmes, ccheung
sspitsyn [Fri, 29 Aug 2014 11:35:03 -0700] rev 26418
Merge
sla [Fri, 29 Aug 2014 13:34:16 +0200] rev 26417
8055838: Hotspot does not compile with clang 6.0 (OS X Yosemite)
Reviewed-by: lfoltan, kvn
lfoltan [Thu, 28 Aug 2014 13:01:44 -0400] rev 26416
Merge
lfoltan [Thu, 28 Aug 2014 11:56:06 -0400] rev 26415
8054355: ENFORCE_CC_COMPILER_REV needs to be updated to Solaris C++ 12u3 for JDK 9.
Summary: Update of C++ validiation check for JDK 9 on Solaris.
Reviewed-by: coleenp, dcubed, kvn
coleenp [Thu, 28 Aug 2014 15:44:02 +0000] rev 26414
Merge
coleenp [Thu, 28 Aug 2014 11:30:11 -0400] rev 26413
Merge
coleenp [Thu, 28 Aug 2014 11:29:09 -0400] rev 26412
8049105: Move array component mirror to instance of java/lang/Class (hotspot part 2)
Summary: This removes component mirrors from arrayKlass metadata and the C2 intrinsic for them.
Reviewed-by: kvn, twisti, mgerdin
dsamersoff [Thu, 28 Aug 2014 07:46:49 -0700] rev 26411
8029172: warnings from b117 for hotspot.agent.src.os.linux: JNI exception pending
Summary: Added missed exception checks
Reviewed-by: chegar, sla
dsamersoff [Thu, 28 Aug 2014 06:32:16 -0700] rev 26410
8031583: warnings from b03 for hotspot/agent/src/os/solaris/proc: JNI exception pending
Summary: Added missed exception checks
Reviewed-by: sla, sspitsyn
sla [Thu, 28 Aug 2014 10:28:21 +0200] rev 26409
8055755: Information about loaded dynamic libraries is wrong on MacOSX
Summary: The information about loaded dynamic libraries printed in hs_err_pid files or by running the jcmd VM.dynlib is partly incorrect. The address printed in front of the library file name is wrong.
Reviewed-by: sla, gziemski, gtriantafill
Contributed-by: fredrik.arvidsson@oracle.com
ccheung [Wed, 27 Aug 2014 10:42:28 -0700] rev 26408
8056175: Change "8048150: Allow easy configurations for large CDS archives" triggers conversion warning with older GCC
Summary: cast the result of the conversion to uintx
Reviewed-by: ccheung, coleenp
Contributed-by: volker.simonis@gmail.com
katleman [Thu, 11 Sep 2014 09:08:47 -0700] rev 26407
Added tag jdk9-b30 for changeset 9628dff9b9a1
lana [Thu, 11 Sep 2014 14:27:55 -0700] rev 26406
Merge
chegar [Thu, 11 Sep 2014 10:29:15 +0100] rev 26405
8058117: Missing jdk.deploy.osx from modules.xml
Reviewed-by: alanb, mchung
lana [Wed, 10 Sep 2014 19:36:32 -0700] rev 26404
Merge
mchung [Wed, 10 Sep 2014 17:32:40 -0700] rev 26403
8057627: Add org.w3c.dom.ranges and org.w3c.dom.traversal as exported API in modules.xml
Reviewed-by: alanb
mduigou [Wed, 10 Sep 2014 12:28:14 -0700] rev 26402
8056195: Add CUSTOM_SUMMARY_AND_WARNINGS_HOOK
Reviewed-by: ihse, erikj
coffeys [Wed, 10 Sep 2014 16:13:35 +0100] rev 26401
8057813: Alterations to jdk_security3 test target
Reviewed-by: mullan, wetmore, xuelei
simonis [Tue, 09 Sep 2014 17:42:07 +0100] rev 26400
8057538: Build the freetype library during configure on Windows
Reviewed-by: erikj, ihse
ihse [Tue, 09 Sep 2014 15:12:50 +0200] rev 26399
8057125: The fix for JDK-8027627 was incomplete: Don't hardcode bash anywhere.
Reviewed-by: erikj
erikj [Fri, 05 Sep 2014 12:42:41 +0200] rev 26398
8057537: Serialize reconfigure and fix make clean-foo foo
Reviewed-by: dholmes, ihse, tbell
katleman [Thu, 11 Sep 2014 09:08:38 -0700] rev 26397
Added tag jdk9-b30 for changeset 8d6d3257c748
duke [Wed, 05 Jul 2017 20:00:08 +0200] rev 26396
Added tag jdk9-b30 for changeset b2287cac7813
duke [Wed, 05 Jul 2017 20:00:07 +0200] rev 26395
Merge
duke [Wed, 05 Jul 2017 20:00:03 +0200] rev 26394
Merge