aofs-07 #320 (aofs-07)