Add storeman to the build

piggz requested to merge piggz-master-patch-66531 into master May 01, 2020