Merge pull request #3393 from nrwahl2/nrwahl2-mem_assert
Address review from memory alloc assert PR #3388