vyazadji: for conflict 6
resolve conflict 6 in branch:vyazadji-master