aofs-09 #587 (aofs-09)