aofs-12 #552 (aofs-12)