Merge "ART: 088-monitor-verification robustness"