aofs-12 #496 (aofs-12)