aofs-07 #494 (aofs-07)