bug-790: implement that thing.
bug 1131: Yet some more updates by the Policy Officer
Merge branch 'bug-1131' into testserver-stable
Merge branch 'bug-790' into testserver-stable