aofs-08 #609 (aofs-08)