aofs-10 #588 (aofs-10)