aofs-07 #324 (aofs-07)