Added 1,2 alias test and used it. Added TMP_ZZ.
Merge branch 'v0.36'