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