bug 1131: And yet some more updates by the Policy Officer
Merge branch 'bug-1131' into testserver-stable