Allow SelectCustomFieldValue to take a default value
Merge branch '4.2/selectcustomfieldvalue-default'