aofs-10 #525 (aofs-10)