aofs-10 #597 (aofs-10)