Make #20065 reports to work with only current dynamic storage