Merge pull request #577 from syseleven/pp-2587