aofs-12 #621 (aofs-12)