Pull request: Arti sprint 38