aofs-07 #556 (aofs-07)