aofs-10 #338 (aofs-10)