Merge pull request #499 from dshurt/v1.2

Text change
STORE-276	Deactivate Component Adjustment
And various fixes