wip/ap-ometer/patches
