Fixing the violency of FormFieldRegistry, second time. Mergin with the upstream