aofs-10 #337 (aofs-10)