aofs-07 #490 (aofs-07)