Oliver Gierke commented on Improvement HHH-10793