Package from commit 6ed7f370def2fdf7557fff315e3565ba686589e8