aofs-09 #507 (aofs-09)