Merge "Regression test for autopatrolling rollbacks"