Closed matthiasblaesing closed 5 months ago
Closes: #7066
This is a companion for #6984, #6985 and #7020. Will merge together with these in the next few days.
Closes: #7066