aofs-07 #304 (aofs-07)