Merge "Replace the call to set_offsets()"