Merge "fix bp-gen stage jobname"