aofs-07 #390 (aofs-07)