aofs-10 #238 (aofs-10)