Merge "Add change verification" into stable-3.3