Merged profelis pull request