Daniel P. changes, manual merge