bug 1131: Yet some more updates by the Policy Officer