aofs-07 #380 (aofs-07)