aofs-08 #507 (aofs-08)