Updated for Apricos ISA v0.8 features