Merge branch 'il/maint-xmallocz' into maint