Mf/bunsen cherry pick memfix