continued refactoring of monitoring facilities
Merge origin/prolog1 into prolog1