aofs-10 #508 (aofs-10)