Merge "Add missing fence()"