aofs-07 #367 (aofs-07)