Update core + zen
Update production makefile
Merge branch 'test'