Merged memory monitor 2 into memory monitor
merge conflicts