aofs-10 #535 (aofs-10)