aofs-08 #624 (aofs-08)