Rebasing on changes from Fatme and Erjo