aofs-08 #602 (aofs-08)