#642 - manual merge