aofs-10 #161 (aofs-10)