aofs-07 #373 (aofs-07)