aofs-10 #529 (aofs-10)