Refactor storage class generation.

Andrei Mateescurequested to merge
issue/trash-3452414:3452414-refactor-storage-class-generation into 3.1.x

Closes #3452414

Merge request reports