aofs-12 #372 (aofs-12)