aofs-08 #615 (aofs-08)