aofs-12 #615 (aofs-12)