Merge in sauce labs changes