Merge branch 'vladimir-kotikov-master'