updates from ticket trac.tools.ietf.org/wg/roll/trac/ticket/150