aofs-10 #599 (aofs-10)