[DF-539] Fixed custom properties issue