Resolve #3482290

Daniel Cothranrequested to merge
issue/charts-3482290:3482290- into 5.1.x

Closes #3482290

Merge request reports