aofs-07 #371 (aofs-07)