aofs-08 #371 (aofs-08)