I want to fix the issue , I am debating between 2 solutions:

Solution 1: in the setter itself - to check if this property is lazy and the new value = null - if so call the getter method - to fetch the property from DB.

Advantages: this fixing should solve the 2 issues ( HHH-13840 Open and HHH-12772 Open )

Disadvantages: if the entity is detach during the setter - a lazy exception will be thrown and it’s not acceptable to get this exception by calling setter method. in additional it could cause performance issue .

Solution 2: in the setter - to check if the property is lazy and not exist in the interceptor and the new value is null - then track change for this property.

Disadvantages: this fixing will not solve issue HHH-12772 Open , but only HHH-13840 Open .

Advantages: this fixing is not risky and cannot cause any issues.

Hibernate Team , I will be glad to hear your opinion. thanks.