Pull request for conflict 6 from vyazadji