[DF-29] fixes for loading custom props