Fixes support for TreatControlEnabledFalseAsNull option