Issue #3238400 by philltran: Port Leaked metadata detected fix from 8.x.1.x branch

Closes #3238400

Merge request reports

Loading