Fixes #16392. Reevaluate sanitize class for each store.

Carsten Roserequested to merge
B16392-sanatizedefaultclass into develop

Merge request reports