[mikkokotila]

Thanks, I think that is a good idea. Especially given we are talking about the future generation, and not dinosaurs like myself (attached to 2.7). Will make that change few parts down and then "upgrade" the early parts as well.