Merge "Add attributes for exported properties"