Full source code merge with ARM & ZGK