aofs-07 #557 (aofs-07)