Merge "Fix a bug with volatile fields."