aofs-10 #384 (aofs-10)