aofs-12 #330 (aofs-12)