Merge branch 'vshulyak' into develop