Merge 4.1 remaining issues into master #1933

Closed arjantijms closed 5 months ago