aofs-08 #557 (aofs-08)