Merge pull request #5183 from val-kulkov/pigeonhole-package