Merge "Refactor verification job templates"