aofs-10 #479 (aofs-10)