aofs-10 #618 (aofs-10)