aofs-10 #359 (aofs-10)