aofs-07 #597 (aofs-07)