- [x] #2782 - [x] #2773 - [x] #2483 should also be added to the 1.x branch
should also be added to the 1.x branch