ZM Compatibility improvements with merged version