Align with latest APARAPI commits