aofs-07 #516 (aofs-07)