Merge "Unhide Offset-related tags"