aofs-12 #580 (aofs-12)