@dangoor since release 40 is branched already, i think it will make sense to make these changes in this same PR. no rush landing it.