(cherry picked from commit cd8dfb86)
assigned to @kdaudt
approved this merge request
enabled an automatic merge when all merge checks for b37bee23 pass
merged