aofs-09 #372 (aofs-09)