basic version merging from 2.83