Merge "Fraser 6.0.0 tag"