Patch 12

Seems to be done.

Please check OOM and Caching for me if it's oke.