aofs-08 #372 (aofs-08)