aofs-12 #371 (aofs-12)