aofs-08 #364 (aofs-08)