Merge branch 'TarasK'
Merge branch 'master' into Katolyk