aofs-07 #346 (aofs-07)