optimized annotation for productType stockStates reset
Merge remote-tracking branch 'origin/dev' into dev