Additional memory optimizations...
Merge remote-tracking branch 'remotes/giz/colors' into colors