aofs-07 #496 (aofs-07)