aofs-12 #610 (aofs-12)