aofs-09 #584 (aofs-09)