aofs-10 #343 (aofs-10)