Cleanup.
Added guard for memory tracking.
Merge remote-tracking branch 'upstream/master'
Fixing shaders.