Pull request for conflict 5 from vyazadji