diff --git a/.htaccess b/.htaccess
index 404488eb7ff0ecc6197ab8c100555c79eb1cf0ce..9486d29c5f738c7f3e3d9cc685c57ec8a097b661 100644
--- a/.htaccess
+++ b/.htaccess
@@ -189,3 +189,4 @@
 ## http://developer.yahoo.com/performance/rules.html#etags
 
     #FileETag none
+SetEnv MAGE_MODE developer
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
index 5aa241a5a16ce4826fe2e49b0335aa7a05458448..612dcb6f8a2647b5569f1e1e2389a12da123127b 100644
--- a/app/code/Magento/SalesRule/etc/di.xml
+++ b/app/code/Magento/SalesRule/etc/di.xml
@@ -24,4 +24,19 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesRule\Model\Resource\Report\Rule">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesRule\Model\Resource\Report\Rule\Createdat">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesRule\Model\Resource\Report\Rule\Updatedat">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index 43e8d0247dca05972f96b0f7d81de2e0ba2bb613..6f1f1afe820b201f5ba69be013b68324b34a8594 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -62,4 +62,14 @@
     <type name="Magento\Quote\Model\Quote\Address\ToOrder">
         <plugin name="add_tax_to_order" type="Magento\Tax\Model\Quote\ToOrderConverter"/>
     </type>
+    <type name="Magento\Tax\Model\Resource\Report\Tax\Createdat">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Tax\Model\Resource\Report\Tax\Updatedat">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
 </config>