diff --git a/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php
index 573a92b6105..6a53b2a397e 100644
--- a/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php
+++ b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php
@@ -62,7 +62,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_6';
+        return 'v1_7';
     }
 
     /**
diff --git a/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_7/DropExtendConfigQuery.php b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_7/DropExtendConfigQuery.php
new file mode 100644
index 00000000000..9b8ae8121df
--- /dev/null
+++ b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_7/DropExtendConfigQuery.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace OroCRM\Bundle\AccountBundle\Migrations\Schema\v1_7;
+
+use Psr\Log\LoggerInterface;
+
+use Oro\Bundle\MigrationBundle\Migration\ArrayLogger;
+use Oro\Bundle\MigrationBundle\Migration\ParametrizedMigrationQuery;
+
+class DropExtendConfigQuery extends ParametrizedMigrationQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getDescription()
+    {
+        $logger = new ArrayLogger();
+        $logger->info('Drop extend config values');
+        $this->doExecute($logger, true);
+
+        return $logger->getMessages();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute(LoggerInterface $logger)
+    {
+        $this->doExecute($logger);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doExecute(LoggerInterface $logger, $dryRun = false)
+    {
+        $updateSql = <<<DQL
+             DELETE FROM oro_entity_config_field WHERE field_name IN (?, ?, ?, ?, ?, ?, ?)
+             AND entity_id IN (SELECT id FROM oro_entity_config WHERE class_name = ?);
+DQL;
+
+        $params = [
+            'extend_website',
+            'extend_employees',
+            'extend_ownership',
+            'extend_ticker_symbol',
+            'extend_rating',
+            'shippingAddress',
+            'billingAddress',
+            'OroCRM\\Bundle\\AccountBundle\\Entity\\Account',
+        ];
+
+        $this->logQuery($logger, $updateSql, $params);
+        if (!$dryRun) {
+            $this->connection->executeUpdate($updateSql, $params);
+        }
+    }
+}
diff --git a/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_7/OroCRMSalesBundle.php b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_7/OroCRMSalesBundle.php
new file mode 100644
index 00000000000..940732813ed
--- /dev/null
+++ b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_7/OroCRMSalesBundle.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace OroCRM\Bundle\AccountBundle\Migrations\Schema\v1_7;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class OroCRMSalesBundle implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $queries->addPostQuery(new DropExtendConfigQuery());
+    }
+}
diff --git a/src/OroCRM/Bundle/MagentoBundle/Resources/views/Order/widget/info.html.twig b/src/OroCRM/Bundle/MagentoBundle/Resources/views/Order/widget/info.html.twig
index 099f2559fe0..859853ad6ed 100644
--- a/src/OroCRM/Bundle/MagentoBundle/Resources/views/Order/widget/info.html.twig
+++ b/src/OroCRM/Bundle/MagentoBundle/Resources/views/Order/widget/info.html.twig
@@ -10,6 +10,7 @@
 
             {{ ui.renderProperty('orocrm.magento.order.status.label'|trans, entity.status|trans) }}
             {{ ui.renderProperty('orocrm.magento.order.currency.label'|trans, entity.currency) }}
+            {{ ui.renderProperty('orocrm.magento.order.subtotal_amount.label'|trans, entity.subtotalAmount|oro_format_currency({'currency': entity.currency})) }}
             {{ ui.renderProperty('orocrm.magento.order.total_amount.label'|trans, entity.totalAmount|oro_format_currency({'currency': entity.currency})) }}
             {{ ui.renderProperty('orocrm.magento.order.discount_amount.label'|trans, entity.discountAmount|oro_format_currency({'currency': entity.currency})) }}
             {{ ui.renderProperty('orocrm.magento.order.tax_amount.label'|trans, entity.taxAmount|oro_format_currency({'currency': entity.currency})) }}
diff --git a/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Entity/Repository/TaskRepositoryTest.php b/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Entity/Repository/TaskRepositoryTest.php
index f423d02caae..0ef65968a45 100644
--- a/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Entity/Repository/TaskRepositoryTest.php
+++ b/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Entity/Repository/TaskRepositoryTest.php
@@ -18,14 +18,14 @@ protected function setUp()
     {
         $metadataDriver = new AnnotationDriver(
             new AnnotationReader(),
-            'OroCRM\Bundle\TaskBundle\Entity'
+            'OroCRM\Bundle\TaskBundle\Tests\Unit\Fixtures\Entity'
         );
 
         $this->em = $this->getTestEntityManager();
         $this->em->getConfiguration()->setMetadataDriverImpl($metadataDriver);
         $this->em->getConfiguration()->setEntityNamespaces(
             [
-                'OroCRMTaskBundle' => 'OroCRM\Bundle\TaskBundle\Entity'
+                'OroCRMTaskBundle' => 'OroCRM\Bundle\TaskBundle\Tests\Unit\Fixtures\Entity'
             ]
         );
     }
@@ -43,7 +43,7 @@ public function testGetTaskListByTimeIntervalQueryBuilder()
 
         $this->assertEquals(
             'SELECT t.id, t.subject, t.description, t.dueDate, t.createdAt, t.updatedAt'
-            . ' FROM OroCRM\Bundle\TaskBundle\Entity\Task t'
+            . ' FROM OroCRM\Bundle\TaskBundle\Tests\Unit\Fixtures\Entity\Task t'
             . ' WHERE t.owner = :assignedTo AND t.dueDate >= :start AND t.dueDate <= :end',
             $qb->getDQL()
         );
diff --git a/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Fixtures/Entity/Task.php b/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Fixtures/Entity/Task.php
new file mode 100644
index 00000000000..48d028cd3fc
--- /dev/null
+++ b/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Fixtures/Entity/Task.php
@@ -0,0 +1,379 @@
+<?php
+
+namespace OroCRM\Bundle\TaskBundle\Tests\Unit\Fixtures\Entity;
+
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
+
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
+use Oro\Bundle\ReminderBundle\Entity\RemindableInterface;
+use Oro\Bundle\ReminderBundle\Model\ReminderData;
+use Oro\Bundle\UserBundle\Entity\User;
+use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem;
+use Oro\Bundle\WorkflowBundle\Entity\WorkflowStep;
+
+use OroCRM\Bundle\TaskBundle\Model\ExtendTask;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(
+ *      name="orocrm_task",
+ *      indexes={
+ *          @ORM\Index(name="task_due_date_idx",columns={"due_date"}),
+ *          @ORM\Index(name="task_updated_at_idx",columns={"updatedAt"}),
+ *      }
+ * )
+ * @ORM\HasLifecycleCallbacks()
+ * @ORM\Entity(repositoryClass="OroCRM\Bundle\TaskBundle\Entity\Repository\TaskRepository")
+ */
+class Task extends ExtendTask implements RemindableInterface
+{
+    /**
+     * @var integer
+     *
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="subject", type="string", length=255, nullable=true)
+     */
+    protected $subject;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="description", type="string", length=255, nullable=true)
+     */
+    protected $description;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="due_date", type="datetime", nullable=true)
+     */
+    protected $dueDate;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="TaskPriority")
+     * @ORM\JoinColumn(name="task_priority_name", referencedColumnName="name", onDelete="SET NULL")
+     */
+    protected $taskPriority;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Oro\Bundle\UserBundle\Entity\User")
+     * @ORM\JoinColumn(name="owner_id", referencedColumnName="id", onDelete="SET NULL")
+     */
+    protected $owner;
+
+    /**
+     * @ORM\OneToOne(targetEntity="Oro\Bundle\WorkflowBundle\Entity\WorkflowItem")
+     * @ORM\JoinColumn(name="workflow_item_id", referencedColumnName="id", onDelete="SET NULL")
+     */
+    protected $workflowItem;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Oro\Bundle\WorkflowBundle\Entity\WorkflowStep")
+     * @ORM\JoinColumn(name="workflow_step_id", referencedColumnName="id", onDelete="SET NULL")
+     */
+    protected $workflowStep;
+
+    /**
+     * @var Collection
+     */
+    protected $reminders;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(type="datetime")
+     */
+    protected $createdAt;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(type="datetime")
+     */
+    protected $updatedAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Oro\Bundle\OrganizationBundle\Entity\Organization")
+     * @ORM\JoinColumn(name="organization_id", referencedColumnName="id", onDelete="SET NULL")
+     */
+    protected $organization;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->reminders = new ArrayCollection();
+    }
+
+    /**
+     * @param int $id
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $subject
+     */
+    public function setSubject($subject)
+    {
+        $this->subject = $subject;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSubject()
+    {
+        return $this->subject;
+    }
+
+    /**
+     * @param string $description
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getDueDate()
+    {
+        return $this->dueDate;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDueDateExpired()
+    {
+        return $this->getDueDate() &&  $this->getDueDate() < new \DateTime();
+    }
+
+    /**
+     * @param \DateTime $dueDate
+     */
+    public function setDueDate(\DateTime $dueDate = null)
+    {
+        $this->dueDate = $dueDate;
+    }
+
+    /**
+     * @param \DateTime $createdAt
+     */
+    public function setCreatedAt($createdAt)
+    {
+        $this->createdAt = $createdAt;
+    }
+
+    /**
+     * @param \DateTime $updatedAt
+     */
+    public function setUpdatedAt($updatedAt)
+    {
+        $this->updatedAt = $updatedAt;
+    }
+
+    /**
+     * @return TaskPriority
+     */
+    public function getTaskPriority()
+    {
+        return $this->taskPriority;
+    }
+
+    /**
+     * @param TaskPriority $taskPriority
+     */
+    public function setTaskPriority($taskPriority)
+    {
+        $this->taskPriority = $taskPriority;
+    }
+
+    /**
+     * @return User
+     */
+    public function getOwner()
+    {
+        return $this->owner;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getOwnerId()
+    {
+        return $this->getOwner() ? $this->getOwner()->getId() : null;
+    }
+
+    /**
+     * @param User $owner
+     */
+    public function setOwner($owner = null)
+    {
+        $this->owner = $owner;
+    }
+
+    /**
+     * @return string
+     */
+    public function getWorkflowStepName()
+    {
+        return $this->getWorkflowStep() ? $this->getWorkflowStep()->getName() : null;
+    }
+
+    /**
+     * @param WorkflowItem $workflowItem
+     */
+    public function setWorkflowItem($workflowItem)
+    {
+        $this->workflowItem = $workflowItem;
+    }
+
+    /**
+     * @return WorkflowItem
+     */
+    public function getWorkflowItem()
+    {
+        return $this->workflowItem;
+    }
+
+    /**
+     * @param WorkflowItem $workflowStep
+     */
+    public function setWorkflowStep($workflowStep)
+    {
+        $this->workflowStep = $workflowStep;
+    }
+
+    /**
+     * @return WorkflowStep
+     */
+    public function getWorkflowStep()
+    {
+        return $this->workflowStep;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getReminders()
+    {
+        return $this->reminders;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setReminders(Collection $reminders)
+    {
+        $this->reminders = $reminders;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getReminderData()
+    {
+        $result = new ReminderData();
+
+        $result->setSubject($this->getSubject());
+        $result->setExpireAt($this->getDueDate());
+        $result->setRecipient($this->getOwner());
+
+        return $result;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getUpdatedAt()
+    {
+        return $this->updatedAt;
+    }
+
+    /**
+     * @ORM\PrePersist
+     */
+    public function prePersist()
+    {
+        $this->createdAt = new \DateTime('now', new \DateTimeZone('UTC'));
+        $this->updatedAt = clone $this->createdAt;
+    }
+
+    /**
+     * @ORM\PreUpdate
+     */
+    public function preUpdate()
+    {
+        $this->updatedAt = new \DateTime('now', new \DateTimeZone('UTC'));
+    }
+
+    /**
+     * Set organization
+     *
+     * @param Organization $organization
+     * @return Task
+     */
+    public function setOrganization(Organization $organization = null)
+    {
+        $this->organization = $organization;
+
+        return $this;
+    }
+
+    /**
+     * Get organization
+     *
+     * @return Organization
+     */
+    public function getOrganization()
+    {
+        return $this->organization;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string)$this->getSubject();
+    }
+}
diff --git a/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Fixtures/Entity/TaskPriority.php b/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Fixtures/Entity/TaskPriority.php
new file mode 100644
index 00000000000..9d57518889a
--- /dev/null
+++ b/src/OroCRM/Bundle/TaskBundle/Tests/Unit/Fixtures/Entity/TaskPriority.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace OroCRM\Bundle\TaskBundle\Tests\Unit\Fixtures\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+use Oro\Bundle\DataAuditBundle\Metadata\Annotation as Oro;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="orocrm_task_priority")
+ */
+class TaskPriority
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="name", type="string", length=32)
+     * @ORM\Id
+     */
+    protected $name;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="label", type="string", length=255, unique=true)
+     */
+    protected $label;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="`order`", type="integer")
+     */
+    protected $order;
+
+    /**
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Get Task priority name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set Task priority label
+     *
+     * @param string $label
+     * @return TaskPriority
+     */
+    public function setLabel($label)
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    /**
+     * Get task priority label
+     *
+     * @return string
+     */
+    public function getLabel()
+    {
+        return $this->label;
+    }
+
+    /**
+     * Get order
+     *
+     * @return integer
+     */
+    public function getOrder()
+    {
+        return $this->order;
+    }
+
+    /**
+     * Set order
+     *
+     * @param string $order
+     * @return TaskPriority
+     */
+    public function setOrder($order)
+    {
+        $this->order = $order;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->label;
+    }
+}