[DF-540]
[DF-539] Fixed custom properties issue