Simplified memroy handling.
Updated fixed.
Updated fixed.
Updated fixed.
Merge branch 'test' into dev