Merge "Fix invalid shift of 32-bit value." into main