CCFF-777 Feature part1 implemented

Feature part2 implemented