pull in testing and ci changes from future branch