aofs-09 #605 (aofs-09)