Merge "Adapt monitor to apex" into stable/gambia