aofs-10 #584 (aofs-10)