aofs-08 #618 (aofs-08)