[B635] - manual merge