aofs-07 #393 (aofs-07)