Merged changes for customfield definitions