Merge "Fix alias metadata issues."