aofs-07 #618 (aofs-07)