[DF-1203] Don't save empty custom properties