Merge "Revert^2 "Small fix: Use const value on IsHashreeDisabled"" into main