Initial commit for custom attributes TR fix