I have realized that current fix does not fully guarantee the same consistency because of HHH-9988 - that should be addressed first.