aofs-10 #613 (aofs-10)