main
Do not use descriptors for private class elements (#16261)
Move new private elements helper parameters (#16299)