Mergeit

Merged dev & value branches