aofs-08 #597 (aofs-08)