CFY-1688
CFY-1661
CFY-1661
CFY-1661
CFY-1661
CFY-1604 tests
CFY-1604 tests
Deleted .idea folder
merge with master