diff -u b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
--- b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/Form/RevisionableContentEntityForm.php
@@ -91,15 +91,13 @@
     $form = parent::form($form, $form_state);
 
     $entity_type = $this->entity->getEntityType();
-    $account = $this->currentUser();
 
     if ($this->operation == 'edit') {
 
       $bundle_info = $this->entityTypeBundleInfo->getBundleInfo($entity_type->id());
       if ($bundle_info[$this->entity->bundle()]) {
-        $bundleLabel = $bundle_info[$this->entity->bundle()]['label'];
         $form['#title'] = $this->t('<em>Edit @bundle_label</em> @label', [
-          '@bundle_label' => $bundleLabel,
+          '@bundle_label' => $bundle_info[$this->entity->bundle()]['label'],
           '@label' => $this->entity->label(),
         ]);
       }
@@ -147,7 +145,7 @@
     // Check the revision log checkbox when the log textarea is filled in.
     // This must not happen if "Create new revision" is enabled by default,
     // since the state would auto-disable the checkbox otherwise.
-    if (!$this->entity->isNewRevision()) {
+    if (!$new_revision_default) {
       $form['revision']['#states'] = [
         'checked' => [
           'textarea[name="revision_log[0][value]"]' => ['empty' => FALSE],
@@ -164,6 +162,31 @@
 
   /**
    * {@inheritdoc}
+   *
+   * Updates the content object by processing the submitted values.
+   *
+   * This function can be called by a "Next" button of a wizard to update the
+   * form state's entity with the current step's values before proceeding to the
+   * next step.
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Build the node object from the submitted values.
+    parent::submitForm($form, $form_state);
+    $node = $this->entity;
+
+    // Save as a new revision if requested to do so.
+    if (!$form_state->isValueEmpty('revision') && $form_state->getValue('revision') != FALSE) {
+      $node->setNewRevision();
+      // If a new revision is created, save the current user as revision author.
+      $node->setRevisionUserId(\Drupal::currentUser()->id());
+    }
+    else {
+      $node->setNewRevision(FALSE);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
    */
   public function save(array $form, FormStateInterface $form_state) {
     // Save as a new revision if requested to do so.
diff -u b/core/modules/block_content/src/Entity/BlockContent.php b/core/modules/block_content/src/Entity/BlockContent.php
--- b/core/modules/block_content/src/Entity/BlockContent.php
+++ b/core/modules/block_content/src/Entity/BlockContent.php
@@ -135,6 +135,9 @@
       // one.
       $record->revision_log = $this->original->getRevisionLogMessage();
     }
+    else {
+      $this->setRevisionCreationTime(REQUEST_TIME);
+    }
   }
 
   /**
diff -u b/core/modules/node/node.libraries.yml b/core/modules/node/node.libraries.yml
--- b/core/modules/node/node.libraries.yml
+++ b/core/modules/node/node.libraries.yml
@@ -6,7 +6,7 @@
   js:
     node.js: {}
   dependencies:
-    - core/drupal.entity
+    - core/drupal.entity-form
     - core/drupalSettings
 
 drupal.node.preview:
diff -u b/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
--- b/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -264,32 +264,6 @@
   }
 
   /**
-   * {@inheritdoc}
-   *
-   * Updates the node object by processing the submitted values.
-   *
-   * This function can be called by a "Next" button of a wizard to update the
-   * form state's entity with the current step's values before proceeding to the
-   * next step.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Build the node object from the submitted values.
-    parent::submitForm($form, $form_state);
-    $node = $this->entity;
-
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('revision') && $form_state->getValue('revision') != FALSE) {
-      $node->setNewRevision();
-      // If a new revision is created, save the current user as revision author.
-      $node->setRevisionCreationTime(REQUEST_TIME);
-      $node->setRevisionUserId(\Drupal::currentUser()->id());
-    }
-    else {
-      $node->setNewRevision(FALSE);
-    }
-  }
-
-  /**
    * Form submission handler for the 'preview' action.
    *
    * @param $form
only in patch2:
unchanged:
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -123,6 +123,9 @@ public function preSaveRevision(EntityStorageInterface $storage, \stdClass $reco
       // entry with an empty one.
       $record->revision_log = $this->original->revision_log->value;
     }
+    else {
+      $record->revision_timestamp = REQUEST_TIME;
+    }
   }
 
   /**