Pull fix-offsets-h into release branch