aofs-11 #615 (aofs-11)