aofs-08 #632 (aofs-08)