Merge branch 'vpirogov-master'