Resolve #3440133 "Improve purge logic"

Jacob Rockowitzrequested to merge
issue/webform-3440133:3440133-improve-purge-logic into 6.3.x

Closes #3440133

Merge request reports