aofs-08 #351 (aofs-08)