aofs-07 #364 (aofs-07)