Issue #40: CHERRY-AN8 code ported