merge with eldafani  repository