[DF-185] Added type conversion
[DF-185] Merge
[DF-185] Fixed projects