Hand merge of MR !31: Update the CI infrastructure to be faster