aofs-07 #510 (aofs-07)