aofs-07 #325 (aofs-07)