Merge branch 'tg/memfixes' into maint