aofs-08 #373 (aofs-08)