diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 41e76dc9c0..6dd01fe7b8 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1670,7 +1670,7 @@ Setting this too high may cause the JVM to run out of heap space
 when handling very big binary files, such as device firmware or
 CD-ROM ISO images.
 +
-Defaults to 25% of the available JVM heap, limited to 2048m.
+Defaults to 25% of the available JVM heap, limited to 2g.
 +
 Common unit suffixes of 'k', 'm', or 'g' are supported.
 
diff --git a/java/com/google/gerrit/server/notedb/ChangeUpdate.java b/java/com/google/gerrit/server/notedb/ChangeUpdate.java
index c0cd173428..b2f85fcf62 100644
--- a/java/com/google/gerrit/server/notedb/ChangeUpdate.java
+++ b/java/com/google/gerrit/server/notedb/ChangeUpdate.java
@@ -216,7 +216,7 @@ public class ChangeUpdate extends AbstractChangeUpdate {
   }
 
   public void setStatus(Change.Status status) {
-    checkArgument(status != Change.Status.MERGED, "use merge(Iterable<SubmitRecord>)");
+    checkArgument(status != Change.Status.MERGED, "use merge(RequestId, Iterable<SubmitRecord>)");
     this.status = status;
   }
 
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
index 5375ef8969..3151a120f2 100644
--- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
@@ -100,6 +100,7 @@
     'gr-diff gr-syntax gr-syntax-attribute': true,
     'gr-diff gr-syntax gr-syntax-built_in': true,
     'gr-diff gr-syntax gr-syntax-comment': true,
+    'gr-diff gr-syntax gr-syntax-doctag': true,
     'gr-diff gr-syntax gr-syntax-function': true,
     'gr-diff gr-syntax gr-syntax-keyword': true,
     'gr-diff gr-syntax gr-syntax-link': true,
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html b/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
index c9f8eb3799..e5ae06d4f8 100644
--- a/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
@@ -99,8 +99,11 @@ limitations under the License.
       .gr-syntax-template-tag {
         color: var(--syntax-template-tag-color);
       }
-      .gr-syntax-param {
-        color: var(--syntax-param-color);
+      .gr-syntax-params {
+        color: var(--syntax-params-color);
+      }
+      .gr-syntax-doctag {
+        font-weight: var(--syntax-doctag-weight);
       }
     </style>
   </template>
diff --git a/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.html b/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.html
index faffbc5c00..0cb9695cf3 100644
--- a/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.html
+++ b/polygerrit-ui/app/elements/settings/gr-http-password/gr-http-password.html
@@ -18,6 +18,7 @@ limitations under the License.
 <link rel="import" href="/bower_components/polymer/polymer.html">
 <link rel="import" href="../../../styles/gr-form-styles.html">
 <link rel="import" href="../../shared/gr-button/gr-button.html">
+<link rel="import" href="../../shared/gr-copy-clipboard/gr-copy-clipboard.html">
 <link rel="import" href="../../shared/gr-overlay/gr-overlay.html">
 <link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html">
 <link rel="import" href="../../../styles/shared-styles.html">
@@ -37,6 +38,9 @@ limitations under the License.
       #generatedPasswordDisplay {
         margin: var(--spacing-l) 0;
       }
+      #generatedPasswordDisplay .title {
+        width: unset;
+      }
       #generatedPasswordDisplay .value {
         font-family: var(--monospace-font-family);
         font-size: var(--font-size-mono);
@@ -77,6 +81,12 @@ limitations under the License.
         <section id="generatedPasswordDisplay">
           <span class="title">New Password:</span>
           <span class="value">[[_generatedPassword]]</span>
+          <gr-copy-clipboard
+              has-tooltip
+              button-title="Copy password to clipboard"
+              hide-input
+              text="[[_generatedPassword]]">
+          </gr-copy-clipboard>
         </section>
         <section id="passwordWarning">
           This password will not be displayed again.<br>
diff --git a/polygerrit-ui/app/styles/themes/app-theme.html b/polygerrit-ui/app/styles/themes/app-theme.html
index 104a5f5284..56add09216 100644
--- a/polygerrit-ui/app/styles/themes/app-theme.html
+++ b/polygerrit-ui/app/styles/themes/app-theme.html
@@ -140,6 +140,7 @@ html {
   --syntax-built_in-color: #30a;
   --syntax-comment-color: #3f7f5f;
   --syntax-default-color: var(--primary-text-color);
+  --syntax-doctag-weight: bold;
   --syntax-function-color: var(--primary-text-color);
   --syntax-keyword-color: #9e0069;
   --syntax-link-color: #219;
@@ -147,7 +148,7 @@ html {
   --syntax-meta-color: #ff1717;
   --syntax-meta-keyword-color: #219;
   --syntax-number-color: #164;
-  --syntax-param-color: var(--primary-text-color);
+  --syntax-params-color: var(--primary-text-color);
   --syntax-regexp-color: #fa8602;
   --syntax-selector-attr-color: #fa8602;
   --syntax-selector-class-color: #164;
@@ -160,7 +161,6 @@ html {
   --syntax-title-color: #0000c0;
   --syntax-type-color: #2a66d9;
   --syntax-variable-color: var(--primary-text-color);
-
   /* misc */
   --border-radius: 4px;
   --reply-overlay-z-index: 1000;
diff --git a/polygerrit-ui/app/styles/themes/dark-theme.html b/polygerrit-ui/app/styles/themes/dark-theme.html
index cd5f9dd224..957cc25344 100644
--- a/polygerrit-ui/app/styles/themes/dark-theme.html
+++ b/polygerrit-ui/app/styles/themes/dark-theme.html
@@ -110,6 +110,7 @@ limitations under the License.
       --syntax-built_in-color: #f7c369;
       --syntax-comment-color: var(--deemphasized-text-color);
       --syntax-default-color: var(--primary-text-color);
+      --syntax-doctag-weight: bold;
       --syntax-function-color: var(--primary-text-color);
       --syntax-keyword-color: #cd4cf0;
       --syntax-link-color: #c792ea;
@@ -117,7 +118,7 @@ limitations under the License.
       --syntax-meta-color: #6d7eee;
       --syntax-meta-keyword-color: #eefff7;
       --syntax-number-color: #00998a;
-      --syntax-param-color: var(--primary-text-color);
+      --syntax-params-color: var(--primary-text-color);
       --syntax-regexp-color: #f77669;
       --syntax-selector-attr-color: #80cbbf;
       --syntax-selector-class-color: #ffcb68;