aofs-07 #378 (aofs-07)