diff --git a/.htaccess b/.htaccess
index f3dbe217081ac..af9470488c632 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,6 +32,7 @@
 
     DirectoryIndex index.php
 
+<IfModule mod_php5.c>
 ############################################
 ## adjust memory limit
 
@@ -53,7 +54,30 @@
 ## disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
+</IfModule>
+<IfModule mod_php7.c>
+############################################
+## adjust memory limit
+
+    php_value memory_limit 768M
+    php_value max_execution_time 18000
+
+############################################
+## disable automatic session start
+## before autoload was initialized
+
+    php_flag session.auto_start off
+
+############################################
+## enable resulting html compression
+
+    #php_flag zlib.output_compression on
 
+###########################################
+## disable user agent verification to not break multiple image upload
+
+    php_flag suhosin.session.cryptua off
+</IfModule>
 <IfModule mod_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload
diff --git a/.user.ini b/.user.ini
new file mode 100644
index 0000000000000..8c0b765e0551c
--- /dev/null
+++ b/.user.ini
@@ -0,0 +1,4 @@
+memory_limit = 768M
+max_execution_time = 18000
+session.auto_start = off
+suhosin.session.cryptua = off
\ No newline at end of file
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
index f3c7408bb6c2b..6929c7ad9963d 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
@@ -15,7 +15,7 @@
                         <argument name="dataSource" xsi:type="object">Magento\Sales\Model\ResourceModel\Status\Collection</argument>
                         <argument name="default_sort" xsi:type="string">state</argument>
                         <argument name="default_dir" xsi:type="string">desc</argument>
-                        <argument name="pager_visibility" xsi:type="string">0</argument>
+                        <argument name="pager_visibility" xsi:type="string">1</argument>
                     </arguments>
                     <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="sales_order_status.grid.columnSet">
                         <arguments>
diff --git a/pub/.htaccess b/pub/.htaccess
index a8fc2ccf222db..ecdaf1758a92a 100644
--- a/pub/.htaccess
+++ b/pub/.htaccess
@@ -32,6 +32,7 @@
 
     DirectoryIndex index.php
 
+<IfModule mod_php5.c>
 ############################################
 ## Adjust memory limit
 
@@ -53,6 +54,31 @@
 # Disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
+</IfModule>
+<IfModule mod_php7.c>
+############################################
+## Adjust memory limit
+
+    php_value memory_limit 768M
+    php_value max_execution_time 18000
+
+############################################
+## Disable automatic session start
+## before autoload was initialized
+
+    php_flag session.auto_start off
+
+############################################
+## Enable resulting html compression
+
+    #php_flag zlib.output_compression on
+
+###########################################
+# Disable user agent verification to not break multiple image upload
+
+    php_flag suhosin.session.cryptua off
+</IfModule>
+
 
 <IfModule mod_security.c>
 ###########################################
diff --git a/pub/.user.ini b/pub/.user.ini
new file mode 100644
index 0000000000000..8c0b765e0551c
--- /dev/null
+++ b/pub/.user.ini
@@ -0,0 +1,4 @@
+memory_limit = 768M
+max_execution_time = 18000
+session.auto_start = off
+suhosin.session.cryptua = off
\ No newline at end of file