Don't set attribute if value is None
#3816
+9
−8
Merged
None
#3816