aofs-07 #396 (aofs-07)