Merge "Support proc macros from metadata too." into main