aofs-07 #308 (aofs-07)