Reorganize and optimize

1 job for master in 2 minutes and 13 seconds
Status Job ID Name Coverage
  Test
passed #4631
build

00:02:13