OPTIQ-392 Use factories in Field Trimmer