aofs-07 #348 (aofs-07)