Merge "Support ALPHA_8 + HARDWARE" into tm-dev