Merge "Allow redeclaring typeattributes"