Merge 74 stable into 74 root6

I checked this and confirmed that this is what is wanted with @davidlt