Ported values folders from master branch