aofs-07 #290 (aofs-07)