AMGA-13 Fix for custom field