aofs-07 #414 (aofs-07)