including changes from cdmlib-print