[CHANGE] (Performance improvement) Only set not-null properties