Feature/claudia 3988