HR-322 - Ensure customFieldOptions hook is always called for custom fields