Pull request for conflict 4 from vyazadji