aofs-08 #490 (aofs-08)