This is a duplicate of HHH-10876. Gail Badner, I think we should backport HHH-10876 Closed to 5.1 and 5.0 because it causes trouble as described in this issue.