manual merge from branch renzo