Pull request from vyazadji: for conflict 3