aofs-10 #339 (aofs-10)