Depends on existing PRs: * [x] #5203 * [ ] #5215 * [ ] #5196 and some sub-issues which are listed below.