aofs-10 #477 (aofs-10)