# Conflicts:
#	app/code/Magento/Catalog/Model/Product/Price/TierPriceValidator.php
#	app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceValidatorTest.php

Task:
- MAGETWO-62850: API for price update: Special price

--fix ModuleDbChanged test

--fix ModuleDbChanged test

--fix ModuleDbChanged test

Fixed issue:

- MAGETWO-60420 Remove uses of serialize/unserialize in \Magento\Backend\Model\Menu\Config

Fixed issues:

- MAGETWO-58551 Remove uses of unserialize in Module_Quote
- MAGETWO-58455 Remove uses of unserialize in \Magento\Framework\Model\ ResourceModel\Db\AbstractDb and its child classes and their usages
- MAGETWO-58463 Remove uses of unserialize in Module_Sales
- MAGETWO-61872 Create FieldDataConverter
- MAGETWO-62133 Create QueryModifier to select only options of type file and info_buyRequest

Fixed issues:

- MAGETWO-60418 Remove uses of serialize/unserialize in \Magento\Framework\App\PageCache\Kernel
- MAGETWO-60423 Remove uses of serialize/unserialize in \Magento\Framework\View\Layout
- MAGETWO-60419 Remove uses of serialize/unserialize in \Magento\Ui\Model\Manager
- MAGETWO-62919 Update the year in the copyright

Story:
- MAGETWO-52856: [WebAPI] Improve WebAPI performance of Checkout Payment Info/Place order call
Bug:
- MAGETWO-62856: JSUnit job is failed on current mainline
Task:
- MAGETWO-62968: Mark unstable test "RegisterCustomerFrontendEntityTest"

Fearless kiwis magetwo 60765

Fixed issues:
- MAGETWO-60478: Invalid SalesInventory module version
- MAGETWO-60002: Adding attribute to return gives errors
- MAGETWO-62237: [Github][PR] Blank theme: Fix sorter icon changing #7628

- Removed code duplication

* develop: (136 commits)
  MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
  MTO-92: [Variation] Check Shipping Amount if not base currency
  MTO-92: [Variation] Check Shipping Amount if not base currency
  MAGETWO-61829: SOAP/REST tests fail on develop branch but builds are green
  MAGETWO-62387: Travis Build Fail - 2.2.0
  MAGETWO-61902: API for price update: Base, Cost, Tier price
  MTO-96: PR2 stabilization
  MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
  MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
  MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long inde...