aofs-07 #507 (aofs-07)