Merge pull request #4234 from kumpera/katia-flavia