diff --git a/.gitattributes b/.gitattributes
index b155676ba..751c4cb1f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,6 @@
 *.less linguist-vendored
 *.js linguist-vendored
 *.html linguist-vendored
+tests/ export-ignore
+phpunit.xml export-ignore
+
diff --git a/app/Api/v1/ApiController.php b/app/Api/v1/ApiController.php
index 951742e43..d66baa7c4 100644
--- a/app/Api/v1/ApiController.php
+++ b/app/Api/v1/ApiController.php
@@ -359,7 +359,7 @@ class ApiController extends Controller
                     ->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'ticket_thread.id');
             if ($user->role == 'agent') {
                 $id = $user->id;
-                $dept = \DB::table('department_assign_agents')->where('agent_id', '=', $id)->pluck('department_id')->toArray();
+                $dept[] = $user->primary_dpt;
                 $unassigned = $unassigned->where(function ($query) use ($dept, $id) {
                     $query->whereIn('tickets.dept_id', $dept)
                             ->orWhere('assigned_to', '=', $id);
@@ -412,7 +412,7 @@ class ApiController extends Controller
                     ->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'ticket_thread.id');
             if ($user->role == 'agent') {
                 $id = $user->id;
-                $dept = \DB::table('department_assign_agents')->where('agent_id', '=', $id)->pluck('department_id')->toArray();
+                $dept[] = $user->primary_dpt;
                 $result = $result->where(function ($query) use ($dept, $id) {
                     $query->whereIn('tickets.dept_id', $dept)
                             ->orWhere('assigned_to', '=', $id);
@@ -977,7 +977,7 @@ class ApiController extends Controller
                     ->where('ticket_status.name', 'Open');
             if ($user->role == 'agent') {
                 $id = $user->id;
-                $dept = \DB::table('department_assign_agents')->where('agent_id', '=', $id)->pluck('department_id')->toArray();
+                $dept[] = $user->primary_dpt;
                 $inbox = $inbox->where(function ($query) use ($dept, $id) {
                     $query->whereIn('tickets.dept_id', $dept)
                             ->orWhere('assigned_to', '=', $id);
@@ -1061,7 +1061,7 @@ class ApiController extends Controller
                     ->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'ticket_thread.id');
             if ($user->role == 'agent') {
                 $id = $user->id;
-                $dept = \DB::table('department_assign_agents')->where('agent_id', '=', $id)->pluck('department_id')->toArray();
+                $dept[] = $user->primary_dpt;
                 $trash = $trash->where(function ($query) use ($dept, $id) {
                     $query->whereIn('tickets.dept_id', $dept)
                             ->orWhere('assigned_to', '=', $id);
@@ -1432,7 +1432,7 @@ class ApiController extends Controller
             $tickets = \DB::table('tickets');
             if ($user->role == 'agent') {
                 $id = $user->id;
-                $dept = DepartmentAssignAgents::where('agent_id', '=', $id)->pluck('department_id')->toArray();
+                $dept[] = $user->primary_dpt;
                 $tickets = $tickets->whereIn('tickets.dept_id', $dept)->orWhere('assigned_to', '=', $user->id);
             }
             $department = $this->department->select('name', 'id')->get()->toArray();
diff --git a/public/downloads/en.zip b/public/downloads/en.zip
index 3a91cbad6..0e4ab9c5d 100644
Binary files a/public/downloads/en.zip and b/public/downloads/en.zip differ
diff --git a/release-notes.txt b/release-notes.txt
index 3f2ab48c6..3d748bdc9 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -34,6 +34,12 @@ As we mentioned in last release that the application is now compatible with PHP7
 - Integrated slack channel for travis build notifications
 - Updated Bugsnag API key
 
+Error Reporting
+--------------------------
+Faveo uses [Bugsnag](https://www.bugsnag.com/) to monitor application stability in production enviroment. It helps us to provide bug fixes and feature updates after analyzing the logs and crash reports for the application. **If you are customizing the application under development environment, we request you to disable this error reporting.** It will allow us to ignore the errors occurred during your development cycle and we can focus more on the exceptions/bugs occuring in live system of other users of Faveo community. It can be easily disabled from "Error logs and debugging" option in admin panel or by updating your app environment to development in `.env`.
+
+You can still report the issues on our [Github Issue page](https://github.com/ladybirdweb/faveo-helpdesk/issues) by providing proper information about the changes you are trying to implement. We assure you that Faveo community will help you and your customization can be a part of Faveo application if it follows our contributing guidelines.
+
 |=====================================================
 | v1.10 Laravel Framework update
 |=====================================================
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index c13215c8d..2bdc587c4 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -766,7 +766,6 @@ return array(
     'Table_Row_Group_Frame_Reflower' => $vendorDir . '/dompdf/dompdf/include/table_row_group_frame_reflower.cls.php',
     'Table_Row_Group_Renderer' => $vendorDir . '/dompdf/dompdf/include/table_row_group_renderer.cls.php',
     'Table_Row_Positioner' => $vendorDir . '/dompdf/dompdf/include/table_row_positioner.cls.php',
-    'TestCase' => $baseDir . '/tests/TestCase.php',
     'Text_Frame_Decorator' => $vendorDir . '/dompdf/dompdf/include/text_frame_decorator.cls.php',
     'Text_Frame_Reflower' => $vendorDir . '/dompdf/dompdf/include/text_frame_reflower.cls.php',
     'Text_Renderer' => $vendorDir . '/dompdf/dompdf/include/text_renderer.cls.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 95ded5c43..47e57967e 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -1453,7 +1453,6 @@ class ComposerStaticInit598add4b9b35c76d3599603201ccdd6d
         'Table_Row_Group_Frame_Reflower' => __DIR__ . '/..' . '/dompdf/dompdf/include/table_row_group_frame_reflower.cls.php',
         'Table_Row_Group_Renderer' => __DIR__ . '/..' . '/dompdf/dompdf/include/table_row_group_renderer.cls.php',
         'Table_Row_Positioner' => __DIR__ . '/..' . '/dompdf/dompdf/include/table_row_positioner.cls.php',
-        'TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php',
         'Text_Frame_Decorator' => __DIR__ . '/..' . '/dompdf/dompdf/include/text_frame_decorator.cls.php',
         'Text_Frame_Reflower' => __DIR__ . '/..' . '/dompdf/dompdf/include/text_frame_reflower.cls.php',
         'Text_Renderer' => __DIR__ . '/..' . '/dompdf/dompdf/include/text_renderer.cls.php',