After too much nagging I added the option to ignore memory size.
Merge branch 'test' into dev