[DF-1500] - fixed project issues.
[DF-185] Merged with to_master_qa