aofs-09 #557 (aofs-09)