Merge branch 'amf/mem_leak' into sprint64