aofs-07 #372 (aofs-07)