Merge "Acceptance-tests: Fix 'verify: false' bug"