diff --git a/packages/strapi-admin/admin/src/components/Roles/ConditionsSelect/MenuList/Ul.js b/packages/strapi-admin/admin/src/components/Roles/ConditionsSelect/MenuList/Ul.js
index 299d02413c..f94b2bce92 100644
--- a/packages/strapi-admin/admin/src/components/Roles/ConditionsSelect/MenuList/Ul.js
+++ b/packages/strapi-admin/admin/src/components/Roles/ConditionsSelect/MenuList/Ul.js
@@ -68,6 +68,7 @@ const Ul = styled.ul`
       cursor: not-allowed !important;
     }
     input[type='checkbox'] {
+      cursor: not-allowed;
       &:after {
         cursor: not-allowed;
         color: ${theme.main.colors.grey};
diff --git a/packages/strapi-generate-new/lib/resources/files/favicon.ico b/packages/strapi-generate-new/lib/resources/files/favicon.ico
index d7be3ab551..03eec51b18 100644
Binary files a/packages/strapi-generate-new/lib/resources/files/favicon.ico and b/packages/strapi-generate-new/lib/resources/files/favicon.ico differ
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/TableHeader.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/TableHeader.js
index 08ed68f2a0..4898c51acd 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/TableHeader.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/TableHeader.js
@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import PropTypes from 'prop-types';
-
+import { useGlobalContext } from 'strapi-helper-plugin';
 import useListView from '../../hooks/useListView';
 import CustomInputCheckbox from '../CustomInputCheckbox';
 import { Arrow, Thead } from './styledComponents';
@@ -16,6 +16,7 @@ function TableHeader({ headers, isBulkable }) {
     onChangeSearch,
     _sort,
   } = useListView();
+  const { emitEvent } = useGlobalContext();
   const [sortBy, sortOrder] = _sort.split(':');
 
   return (
@@ -38,6 +39,7 @@ function TableHeader({ headers, isBulkable }) {
               key={header.key || header.name}
               onClick={() => {
                 if (header.sortable) {
+                  emitEvent('didSortEntries');
                   const isCurrentSort = header.name === sortBy;
                   const nextOrder = isCurrentSort && sortOrder === 'ASC' ? 'DESC' : 'ASC';
                   let value = `${header.name}:${nextOrder}`;
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Search/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Search/index.js
index 26a9cdcb4e..560631bc4e 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/Search/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/Search/index.js
@@ -8,13 +8,15 @@ import React, { memo } from 'react';
 import { isEmpty, upperFirst } from 'lodash';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { HeaderSearch } from 'strapi-helper-plugin';
+import { HeaderSearch, GlobalContext } from 'strapi-helper-plugin';
 import getTrad from '../../utils/getTrad';
 
 const WAIT = 400;
 
 class Search extends React.Component {
-  state = { value: this.props.initValue };
+  static contextType = GlobalContext;
+
+  state = { didType: false, value: this.props.initValue };
 
   timer = null;
 
@@ -29,13 +31,17 @@ class Search extends React.Component {
   resetState = () => this.setState({ value: '' });
 
   handleChange = ({ target }) => {
+    if (!this.state.didType) {
+      this.context.emitEvent('didSearch');
+    }
+
     clearTimeout(this.timer);
-    this.setState({ value: target.value });
+    this.setState({ value: target.value, didType: !!target.value });
     this.timer = setTimeout(() => this.triggerChange(target.value), WAIT);
   };
 
   handleClick = () => {
-    this.setState({ value: '' });
+    this.setState({ value: '', didType: false });
     this.triggerChange('');
   };
 
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MenuList.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MenuList.js
index 0d8490f3cf..55e3877a2c 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MenuList.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MenuList.js
@@ -35,7 +35,7 @@ const MenuList = ({
             return (
               <li key={categoryName}>
                 <Category categoryName={categoryName} />
-                <Ul style={{ marginTop: '-4px' }}>
+                <Ul style={{ marginTop: '-4px' }} maxHeight="100%">
                   {componentsGroupedByCategory[categoryName].map(component => {
                     if (
                       (isAddingAComponentToAnotherComponent &&
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js
index 54c857a44c..7dc79a9cc3 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Ul = styled.ul`
-  max-height: 150px;
+  max-height: ${props => props.maxHeight};
   padding: 0 15px;
   background-color: #fff;
   list-style: none;
@@ -59,4 +59,8 @@ const Ul = styled.ul`
   }
 `;
 
+Ul.defaultProps = {
+  maxHeight: '150px',
+};
+
 export default Ul;
diff --git a/packages/strapi-plugin-upload/admin/src/components/InputMedia/index.js b/packages/strapi-plugin-upload/admin/src/components/InputMedia/index.js
index b29d4695ac..994231ea03 100644
--- a/packages/strapi-plugin-upload/admin/src/components/InputMedia/index.js
+++ b/packages/strapi-plugin-upload/admin/src/components/InputMedia/index.js
@@ -94,7 +94,7 @@ const InputMedia = ({ disabled, label, onChange, name, attribute, value, type, i
   };
 
   const handleCopy = () => {
-    strapi.notification.info(getTrad('notification.link-copied'));
+    strapi.notification.info('notification.link-copied');
   };
 
   const handleAllowDrop = e => e.preventDefault();
diff --git a/packages/strapi-plugin-users-permissions/admin/src/translations/en.json b/packages/strapi-plugin-users-permissions/admin/src/translations/en.json
index 97799d6347..995b66a483 100644
--- a/packages/strapi-plugin-users-permissions/admin/src/translations/en.json
+++ b/packages/strapi-plugin-users-permissions/admin/src/translations/en.json
@@ -4,7 +4,7 @@
   "EditForm.inputSelect.label.role": "Default role for authenticated users",
   "EditForm.inputToggle.description.email": "Disallow the user to create multiple accounts using the same email address with different authentication providers.",
   "EditForm.inputToggle.description.email-confirmation": "When enabled (ON), new registred users receive a confirmation email.",
-  "EditForm.inputToggle.description.email-confirmation-redirection": "After confirmed your email, choose where you will be redirected.",
+  "EditForm.inputToggle.description.email-confirmation-redirection": "After you confirmed your email, choose where you will be redirected.",
   "EditForm.inputToggle.description.email-reset-password": "URL of your application's reset password page",
   "EditForm.inputToggle.description.sign-up": "When disabled (OFF), the registration process is forbidden. No one can subscribe anymore no matter the used provider.",
   "EditForm.inputToggle.label.email": "One account per email address",
diff --git a/packages/strapi/lib/Strapi.js b/packages/strapi/lib/Strapi.js
index 996c2476c9..9fed1a8280 100644
--- a/packages/strapi/lib/Strapi.js
+++ b/packages/strapi/lib/Strapi.js
@@ -277,7 +277,7 @@ class Strapi {
 
   async load() {
     this.app.use(async (ctx, next) => {
-      if (ctx.request.url === '/_health' && ctx.request.method === 'HEAD') {
+      if (ctx.request.url === '/_health' && ['HEAD', 'GET'].includes(ctx.request.method)) {
         ctx.set('strapi', 'You are so French!');
         ctx.status = 204;
       } else {