[ESG-1663] added store values to attribute values instead of admin values
Merge branch 'development' into ESG-1663
Merge branch 'ESG-1663' into development