Package based on revision 717de45