missing files added
Merge branch 'dmitryhd-dev' into niksh-dev