STORE-276	Deactivate Component Adjustment
And various fixes
Merge pull request #500 from dshurt/v1.2

STORE-276	Deactivate Component Adjustment