Fix float error when value is None
Merge branch 'release/v2.2.4'