diff --git a/.travis.yml b/.travis.yml
index 10e372a8f2cdbb..563357347acd0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ branches:
   only:
     - master
     - rnmobile/master
-    - wp/trunk
+    - /wp\/.*/
 
 env:
   global:
diff --git a/packages/api-fetch/src/middlewares/media-upload.js b/packages/api-fetch/src/middlewares/media-upload.js
index b7a14d6b5b050a..6772aaf3ded733 100644
--- a/packages/api-fetch/src/middlewares/media-upload.js
+++ b/packages/api-fetch/src/middlewares/media-upload.js
@@ -54,7 +54,7 @@ function mediaUploadMiddleware( options, next ) {
 	return next( { ...options, parse: false } )
 		.catch( ( response ) => {
 			const attachmentId = response.headers.get( 'x-wp-upload-attachment-id' );
-			if ( ( response.status === 500 || response.status === 502 ) && attachmentId ) {
+			if ( response.status >= 500 && response.status < 600 && attachmentId ) {
 				return postProcess( attachmentId ).catch( () => {
 					if ( options.parse !== false ) {
 						return Promise.reject( {
diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
index 0d422fe245df35..2877a836345317 100644
--- a/packages/block-library/src/list/edit.js
+++ b/packages/block-library/src/list/edit.js
@@ -125,7 +125,7 @@ export default function ListEdit( {
 			className={ className }
 			placeholder={ __( 'Write list…' ) }
 			onMerge={ mergeBlocks }
-			onSplit={ ( value ) => createBlock( name, { ordered, values: value } ) }
+			onSplit={ ( value ) => createBlock( name, { ...attributes, values: value } ) }
 			__unstableOnSplitMiddle={ () => createBlock( 'core/paragraph' ) }
 			onReplace={ onReplace }
 			onRemove={ () => onReplace( [] ) }
diff --git a/packages/edit-post/src/components/meta-boxes/meta-boxes-area/style.scss b/packages/edit-post/src/components/meta-boxes/meta-boxes-area/style.scss
index b86d15952683b0..184835a024c35c 100644
--- a/packages/edit-post/src/components/meta-boxes/meta-boxes-area/style.scss
+++ b/packages/edit-post/src/components/meta-boxes/meta-boxes-area/style.scss
@@ -81,6 +81,25 @@
 	.is-hidden {
 		display: none;
 	}
+
+
+	// Until checkboxes WordPress-wide are updated to match the new style,
+	// checkboxes used in metaboxes have to be slightly unstyled here.
+	// @todo: remove this entire rule once checkboxes are the same everywhere.
+	// See: https://github.com/WordPress/gutenberg/issues/18053
+	.postbox-container .postbox input[type="checkbox"],
+	.postbox-container .postbox input[type="radio"] {
+		border: $border-width solid $dark-gray-300;
+
+		&:checked {
+			background: $white;
+			border-color: $dark-gray-300;
+		}
+
+		&::before {
+			margin: -3px -4px;
+		}
+	}
 }
 
 .edit-post-meta-boxes-area__clear {
diff --git a/packages/editor/src/components/local-autosave-monitor/index.js b/packages/editor/src/components/local-autosave-monitor/index.js
index 629bbe824cf36b..1ef63431288ff7 100644
--- a/packages/editor/src/components/local-autosave-monitor/index.js
+++ b/packages/editor/src/components/local-autosave-monitor/index.js
@@ -142,7 +142,12 @@ function useAutosavePurge() {
 	const lastIsAutosaving = useRef( isAutosaving );
 
 	useEffect( () => {
-		if ( lastIsAutosaving.current && ! isAutosaving && ! didError ) {
+		if (
+			! didError && (
+				( lastIsAutosaving.current && ! isAutosaving ) ||
+				( lastIsDirty.current && ! isDirty )
+			)
+		) {
 			localAutosaveClear( postId );
 		}