aofs-10 #235 (aofs-10)