bug 1131: And yet some more updates by the Policy Officer