aofs-07 #329 (aofs-07)