Restore CI by merging the config file from master