aofs-10 #367 (aofs-10)