Merge "Avoid autoboxing overhead in hash calculation" into main