Merge "Use attribute" into main