Merge branch 'tg/memfixes'