aofs-08 #585 (aofs-08)