wip/wmsupermon/patches
