aofs-12 #334 (aofs-12)