Manual merge from 4.2-dev for TRQ-2484 - torque not honoring env. variable with empty fields.