aofs-07 #584 (aofs-07)