Merge "Adapt engine-verify jobs for engine refactoring"