aofs-07 #499 (aofs-07)