Merge "Adapt monitor to apex"