aofs-07 #294 (aofs-07)