aofs-09 #624 (aofs-09)